diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
401 files changed, 3308 insertions, 2769 deletions
diff --git a/nixpkgs/pkgs/development/libraries/LAStools/default.nix b/nixpkgs/pkgs/development/libraries/LAStools/default.nix index 2f2b3b23ae31..5dfd6570c080 100644 --- a/nixpkgs/pkgs/development/libraries/LAStools/default.nix +++ b/nixpkgs/pkgs/development/libraries/LAStools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "LAStools"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "LAStools"; repo = "LAStools"; rev = "v${version}"; - sha256 = "sha256-HL64koe0GNzJzyA0QP4I0M1y2HSxigsZTqOw67RCwNc="; + sha256 = "sha256-IyZjM8YvIVB0VPNuEhmHHw7EuKw5RanB2qhCnBD1fRY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh b/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh index 553e8553a77f..54a9b3e8bfab 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh @@ -1,9 +1,15 @@ addSDLPath () { if [ -e "$1/include/SDL" ]; then export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" - fi - if [ -e "$1/lib" ]; then - export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + # NB this doesn’t work with split dev packages because different packages + # will contain "include/SDL/" and "lib/" directories. + # + # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate + # libraries like SDL_mixer, SDL_image, etc which are not split-package + # so the check above will only trigger on them. + if [ -e "$1/lib" ]; then + export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + fi fi } diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 838bb9ecdbe5..1e63f3bfdef1 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.1"; + version = "2.30.2"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-nwmmyJK1/5Mu7l1YCk4PsasJIrx3jdiM5f/Cu3n0paA="; + hash = "sha256-yYYtsF6+IKynXpfay0rUmCQPdL8vp6dlmon8N7UG89A="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A cross-platform multimedia library"; mainProgram = "sdl2-config"; homepage = "http://www.libsdl.org/"; - changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${version}"; + changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${finalAttrs.version}"; license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix index 70d080e57ab8..d9e8d7e774a7 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; homepage = "https://github.com/libsdl-org/SDL_mixer"; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; license = licenses.zlib; }; } diff --git a/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix deleted file mode 100644 index b07d860cf0c3..000000000000 --- a/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2 }: - -stdenv.mkDerivation rec { - pname = "SDL2_net"; - version = "2.2.0"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-TkqJGYgxYnGXT/TpWF7R73KaEj0iwIvUcxKRedyFf+s="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - - configureFlags = [ "--disable-examples" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - propagatedBuildInputs = [ SDL2 ]; - - meta = with lib; { - description = "SDL multiplatform networking library"; - homepage = "https://www.libsdl.org/projects/SDL_net"; - license = licenses.zlib; - maintainers = with maintainers; [ MP2E ]; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix b/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix index f90be3a751e3..83237060312f 100644 --- a/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; - sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; + sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/202401.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/202401.nix index 0192241a9de9..73e663b0d0c6 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.1"; + version = "20240116.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM="; + hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix index 8a11d3375491..e96c4b0aca81 100644 --- a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitLab, gitUpdater, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "accounts-qt"; - version = "1.16-unstable-2023-11-24"; + version = "1.17"; # pinned to fork with Qt6 support src = fetchFromGitLab { - owner = "nicolasfella"; + owner = "accounts-sso"; repo = "libaccounts-qt"; - rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; - hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; + rev = "refs/tags/VERSION_${finalAttrs.version}"; + hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; }; propagatedBuildInputs = [ glib libaccounts-glib ]; @@ -21,11 +21,15 @@ stdenv.mkDerivation { patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; + passthru.updateScript = gitUpdater { + rev-prefix = "VERSION_"; + }; + meta = with lib; { description = "Qt library for accessing the online accounts database"; mainProgram = "accountstest"; - homepage = "https://gitlab.com/accounts-sso"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-qt"; license = licenses.lgpl21; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/adns/default.nix b/nixpkgs/pkgs/development/libraries/adns/default.nix index 50483758beb5..42edfc190c09 100644 --- a/nixpkgs/pkgs/development/libraries/adns/default.nix +++ b/nixpkgs/pkgs/development/libraries/adns/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" - "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv"; diff --git a/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix b/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix index 4d39fa0325f2..3e8f3f0de318 100644 --- a/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-12-04"; + version = "unstable-2024-03-07"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - rev = "47c2a96220b4d14419e5ddb973bc1fa06933e723"; - hash = "sha256-0U6s6sXdynk2IWRBDXBJCf7Gc+gE8AhR1PXZl0DS4yU="; + rev = "d698f21793c4815082c94d174b9eafae912abb1a"; + hash = "sha256-v8avF9zNNz32kLuAacPdEVeUI9rjn6JCiWPzkXfzBS0="; }; postPatch = '' @@ -17,12 +17,20 @@ mkDerivation rec { # Remove verbosity options as they make Agda take longer and use more memory. shopt -s globstar extglob - sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' src/**/*.@(agda|lagda.md) + files=(src/**/*.@(agda|lagda.md)) + sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' "''${files[@]}" + + # Generate all-pages manually instead of building the build script. + mkdir -p _build + for f in "''${files[@]}"; do + f=''${f#src/} f=''${f%%.*} f=''${f//\//.} + echo "open import $f" + done > _build/all-pages.agda ''; libraryName = "1lab"; libraryFile = "1lab.agda-lib"; - everythingFile = "src/index.lagda.md"; + everythingFile = "_build/all-pages.agda"; meta = with lib; { description = diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index 11c129badd64..311bdd595c68 100644 --- a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -26,10 +26,6 @@ mkDerivation rec { find src -name '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda ''; - # agda: Heap exhausted; - # agda: Current maximum heap size is 4294967296 bytes (4096 MB). - GHCRTS = "-M5G"; - buildInputs = [ standard-library ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index e0c9f5b035e3..f7e93699968f 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.1"; + version = "12.8.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-J4HdOmzF+aSckaRRnd4rHCQzWlv+DMHJiBtjYxQkUrQ="; + hash = "sha256-A7YvjAnk9ddGQ7R4UgdBuOJ7VefkUll4/K4vXXkaw78="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 6ebab7eb4760..270f624965f6 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.50.1"; + version = "2.50.2"; outputs = [ "out" "dev" ]; separateDebugInfo = true; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Vye1wGh6xXuoBA55vWcxtxSja4/PMhkPI2uPs2mHiec="; + hash = "sha256-W4GxRhpi3Y++0aJ2+p71txEvmuX/huHjKtlkS2VP94w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix index cb515ebde884..da288f145613 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.4"; + version = "0.7.6"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-FgD5M16uOQQImmKG9SWBKWHFTONqBd/m7qpXbdkyjz8="; + hash = "sha256-Fi1yowa7LhFMJPolJn0NCgrBbzn9laXA38daZm7l5PU="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix index dccb738a30f4..d67e18476a91 100644 --- a/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index 11305b3735be..8084963f39fb 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { pname = "rtaudio"; version = "5.2.0"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; diff --git a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix index 0fc0635747e5..f6b6eceb4c04 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -47,9 +47,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ - fogti - yuu - ]; + maintainers = with maintainers; [ yuu ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38469.patch b/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38469.patch deleted file mode 100644 index ff6cd65de0f4..000000000000 --- a/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38469.patch +++ /dev/null @@ -1,102 +0,0 @@ -From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 -From: Evgeny Vereshchagin <evvers@ya.ru> -Date: Mon, 23 Oct 2023 20:29:31 +0000 -Subject: [PATCH 1/2] core: reject overly long TXT resource records - -Closes https://github.com/lathiat/avahi/issues/455 - -CVE-2023-38469 ---- - avahi-core/rr.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/avahi-core/rr.c b/avahi-core/rr.c -index 2bb89244..9c04ebbd 100644 ---- a/avahi-core/rr.c -+++ b/avahi-core/rr.c -@@ -32,6 +32,7 @@ - #include <avahi-common/malloc.h> - #include <avahi-common/defs.h> - -+#include "dns.h" - #include "rr.h" - #include "log.h" - #include "util.h" -@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { - case AVAHI_DNS_TYPE_TXT: { - - AvahiStringList *strlst; -+ size_t used = 0; - -- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) -+ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { - if (strlst->size > 255 || strlst->size <= 0) - return 0; - -+ used += 1+strlst->size; -+ if (used > AVAHI_DNS_RDATA_MAX) -+ return 0; -+ } -+ - return 1; - } - } - -From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 -From: Evgeny Vereshchagin <evvers@ya.ru> -Date: Wed, 25 Oct 2023 18:15:42 +0000 -Subject: [PATCH 2/2] tests: pass overly long TXT resource records - -to make sure they don't crash avahi any more. - -It reproduces https://github.com/lathiat/avahi/issues/455 ---- - avahi-client/client-test.c | 14 ++++++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c -index ba979988..da0e43ad 100644 ---- a/avahi-client/client-test.c -+++ b/avahi-client/client-test.c -@@ -22,6 +22,7 @@ - #endif - - #include <stdio.h> -+#include <string.h> - #include <assert.h> - - #include <avahi-client/client.h> -@@ -33,6 +34,8 @@ - #include <avahi-common/malloc.h> - #include <avahi-common/timeval.h> - -+#include <avahi-core/dns.h> -+ - static const AvahiPoll *poll_api = NULL; - static AvahiSimplePoll *simple_poll = NULL; - -@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { - uint32_t cookie; - struct timeval tv; - AvahiAddress a; -+ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; -+ AvahiStringList *txt = NULL; -+ int r; - - simple_poll = avahi_simple_poll_new(); - poll_api = avahi_simple_poll_get(simple_poll); -@@ -261,6 +267,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { - error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); - assert(error != AVAHI_OK); - -+ memset(rdata, 1, sizeof(rdata)); -+ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); -+ assert(r >= 0); -+ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); -+ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); -+ assert(error == AVAHI_ERR_INVALID_RECORD); -+ avahi_string_list_free(txt); -+ - avahi_entry_group_commit (group); - - domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); diff --git a/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch b/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch deleted file mode 100644 index be0faddbfef5..000000000000 --- a/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 04ac71fd56a16365360f14bd4691219913e22f21 Mon Sep 17 00:00:00 2001 -From: Evgeny Vereshchagin <evvers@ya.ru> -Date: Tue, 24 Oct 2023 21:57:32 +0000 -Subject: [PATCH 1/2] smoke-test: call SetHostName with unusual names - -It's prompted by https://github.com/lathiat/avahi/issues/453 ---- - avahi-core/server.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/avahi-core/server.c b/avahi-core/server.c -index f6a21bb7..84df6b5d 100644 ---- a/avahi-core/server.c -+++ b/avahi-core/server.c -@@ -1309,10 +1309,13 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { - else - hn = avahi_normalize_name_strdup(host_name); - -+ if (!hn) -+ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); -+ - h = hn; - if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { - avahi_free(h); -- return AVAHI_ERR_INVALID_HOST_NAME; -+ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); - } - - avahi_free(h); -@@ -1320,7 +1323,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { - h = label_escaped; - len = sizeof(label_escaped); - if (!avahi_escape_label(label, strlen(label), &h, &len)) -- return AVAHI_ERR_INVALID_HOST_NAME; -+ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); - - if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) - return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); -@@ -1330,7 +1333,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { - avahi_free(s->host_name); - s->host_name = avahi_strdup(label_escaped); - if (!s->host_name) -- return AVAHI_ERR_NO_MEMORY; -+ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - - update_fqdn(s); - diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index 0381146988a0..ac3db3650e76 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { url = "https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c.patch"; sha256 = "sha256-Fanh9bvz+uknr5pAmltqijuUAZIG39JR2Lyq5zGKJ58="; }) + # https://github.com/avahi/avahi/pull/480 merged Sept 19 + (fetchpatch { + name = "bail-out-unless-escaped-labels-fit.patch"; + url = "https://github.com/avahi/avahi/commit/20dec84b2480821704258bc908e7b2bd2e883b24.patch"; + sha256 = "sha256-p/dOuQ/GInIcUwuFhQR3mGc5YBL5J8ho+1gvzcqEN0c="; + }) # CVE-2023-38473 # https://github.com/lathiat/avahi/pull/486 merged Oct 18 (fetchpatch { @@ -79,12 +85,39 @@ stdenv.mkDerivation rec { sha256 = "sha256-4dG+5ZHDa+A4/CszYS8uXWlpmA89m7/jhbZ7rheMs7U="; }) # https://github.com/lathiat/avahi/pull/499 merged Oct 25 - # (but with the changes to '.github/workflows/smoke-tests.sh removed) - ./CVE-2023-38471-2.patch + (fetchpatch { + name = "CVE-2023-38471-2.patch"; + url = "https://github.com/avahi/avahi/commit/b675f70739f404342f7f78635d6e2dcd85a13460.patch"; + sha256 = "sha256-uDtMPWuz1lsu7n0Co/Gpyh369miQ6GWGyC0UPQB/yI8="; + }) # CVE-2023-38469 # https://github.com/lathiat/avahi/pull/500 merged Oct 25 - # (but with the changes to '.github/workflows/smoke-tests.sh removed) - ./CVE-2023-38469.patch + (fetchpatch { + name = "CVE-2023-38469.patch"; + url = "https://github.com/avahi/avahi/commit/61b9874ff91dd20a12483db07df29fe7f35db77f.patch"; + sha256 = "sha256-qR7scfQqhRGxg2n4HQsxVxCLkXbwZi+PlYxrOSEPsL0="; + excludes = [ ".github/workflows/smoke-tests.sh" ]; + }) + # https://github.com/avahi/avahi/pull/515 merged Nov 3 + (fetchpatch { + name = "fix-compare-rrs-with-zero-length-rdata.patch"; + url = "https://github.com/avahi/avahi/commit/177d75e8c43be45a8383d794ce4084dd5d600a9e.patch"; + sha256 = "sha256-uwIyruAWgiWt0yakRrvMdYjjhEhUk5cIGKt6twyXbHw="; + }) + # https://github.com/avahi/avahi/pull/519 merged Nov 8 + (fetchpatch { + name = "reject-non-utf-8-service-names.patch"; + url = "https://github.com/avahi/avahi/commit/2b6d3e99579e3b6e9619708fad8ad8e07ada8218.patch"; + sha256 = "sha256-lwSA3eEQgH0g51r0i9/HJMJPRXrhQnTIEDxcYqUuLdI="; + excludes = [ "fuzz/fuzz-domain.c" ]; + }) + # https://github.com/avahi/avahi/pull/523 merged Nov 12 + (fetchpatch { + name = "core-no-longer-supply-bogus-services-to-callbacks.patch"; + url = "https://github.com/avahi/avahi/commit/93b14365c1c1e04efd1a890e8caa01a2a514bfd8.patch"; + sha256 = "sha256-VBm8vsBZkTbbWAK8FI71SL89lZuYd1yFNoB5o+FvlEU="; + excludes = [ ".github/workflows/smoke-tests.sh" "fuzz/fuzz-packet.c" ]; + }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix index f818e35c458e..7a7d80879558 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.10"; + version = "0.7.16"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-yJ0sgw0y9tIiIHgTPVnfYd8zAGjO83qfeeEzstGH9CE="; + hash = "sha256-76sBv4oChDrkv80HPktkULFNC37kfTNxjlwNg/FJiyA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 5c3abbc58087..360b82b6c679 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.9.10"; + version = "0.9.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xqNqyVtibR8oSMvl5RTU166FIxcbvGjZJOjJ9j6fU78="; + hash = "sha256-aeuIXqnO8divpguDpiPlYJHABYIqegpaDNGwqJ5TKZw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix index 7f273ac80fa0..8f469d93054a 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.3.2"; + version = "0.4.2"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uKprdBJn9yHDm2HCBOiuanizCtLi/VKrvUUScNv6OPY="; + hash = "sha256-wj3PZshUay3HJy+v7cidDL4mDAqSDiX+MmQtJDK4rTI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix index 52d3507b5570..4b22e53a317e 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.7.14"; + version = "0.8.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-HrNdePWNw/5tDBeybnUjK3LgftnGQ4CBXPG0URaxIeU="; + hash = "sha256-S5ETVkdGTndt2GJBNL4DU5SycHAufsmN06xBDRMFVKo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index abb51d0df417..65b584389761 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.36"; + version = "0.14.6"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TwPcsTMBOE1uIInH6/eQdUMV6uD7d60773THzc1/G9Y="; + hash = "sha256-fekeGghqMKbUqKWIfpZg3a6dCpgxywhmXPoGz9y4Aos="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index eb20be82f353..2e6c6a561115 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.9.10"; + version = "0.10.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-hxisqBUARJLtmZniXaZ2th0hqWiKn4XQIy6I0Oz/kUs="; + hash = "sha256-MWcXTMwKtFnrNp+OnHxkiYCUXc3IUhM6iTQa+F9JwsQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix index b3051916fbb8..8db5b837ba6b 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.4.0"; + version = "0.5.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-tb9h78Gd4N11DPB2ETq241lvDQqHIy2HYBsJrBlLpxA="; + hash = "sha256-8eKQsP7AftNDccsZHPC9PcwpbpgZSvsioUuSsiggQDs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix index 2c76371955cb..7ced8b5a415d 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.12"; + version = "0.1.15"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-4YuOC90FBcuNYGBsqw3wKYNGkg3MssezvR8bu6BNGeM="; + hash = "sha256-RTRDbdv+QmRG0Sk/R9qhl45WYEVyl+M0EceLFsoONTI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index 0cd6e4940c4d..c41c5426d566 100644 --- a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.24.7"; + version = "0.26.4"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-AYO0ckqEx2jG7HduvaxASQMOsxuHGkRkyVsUP5WOs98="; + sha256 = "sha256-H5ms6fhhlkARn9g8S5Ma8bnisZv8mfNizP0QpzsF1tA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 448139358e65..0d210abd4a15 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.11.207"; + version = "1.11.296"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-IsPDQJo+TZ2noLefroiWl/Jx8fXmrmY73WHNRO41sik="; + hash = "sha256-yg+OkeUaqwUQGQ5ThIVQUpF2rHm4FuFbcl5gE5WHHOQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index 85c785be3cb3..7e15b74ebee4 100644 --- a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; + sha256 = "sha256-Y+5fHUe1HAjU/cy7jWKE7zVQUezJNFg4q9tn7H1+NuA="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index b3ec8194c92a..e74947dd8194 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -1,30 +1,36 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja , pkg-config +, gi-docgen , gobject-introspection , lcms2 , vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "babl"; - version = "0.1.106"; + version = "0.1.108"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz"; - hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8="; + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; + hash = "sha256-Jt7+neqresTQ4HbKtJwqDW69DfDDH9IJklpfB+3uFHU="; }; + patches = [ + # Allow overriding path to dev output that will be hardcoded e.g. in pkg-config file. + ./dev-prefix.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config + gi-docgen gobject-introspection vala ]; @@ -33,6 +39,15 @@ stdenv.mkDerivation rec { lcms2 ]; + mesonFlags = [ + "-Dprefix-dev=${placeholder "dev"}" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + meta = with lib; { description = "Image pixel format conversion library"; mainProgram = "babl"; @@ -42,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch b/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch new file mode 100644 index 000000000000..9dab6c6a9ad4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index 2350a1f..56f015d 100644 +--- a/meson.build ++++ b/meson.build +@@ -551,7 +551,7 @@ pkgconfig.generate( + variables: [ + 'datadir=${prefix}/share', + 'pluginsdir=${libdir}/@0@'.format(lib_name), +- 'girdir=${datadir}/gir-1.0', ++ 'girdir=@0@/share/gir-1.0'.format(get_option('prefix-dev')), + 'typelibdir=${libdir}/girepository-1.0', + ], + uninstalled_variables: [ +diff --git a/meson_options.txt b/meson_options.txt +index f9d558c..3cac593 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,6 +9,11 @@ option('enable-gir', + choices: ['auto', 'true', 'false'], + description: 'gobject introspection .gir generation' + ) ++option('prefix-dev', ++ type: 'string', ++ value: '', ++ description: 'Like prefix but for dev output of the package' ++) + option('enable-vapi', + type: 'boolean', + value: 'true', diff --git a/nixpkgs/pkgs/development/libraries/boost/1.85.nix b/nixpkgs/pkgs/development/libraries/boost/1.85.nix new file mode 100644 index 000000000000..2a3252d38c57 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/1.85.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.85.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_85_0.html + sha256 = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/boost/default.nix b/nixpkgs/pkgs/development/libraries/boost/default.nix index 6434c6d19699..1a2ae9d24a32 100644 --- a/nixpkgs/pkgs/development/libraries/boost/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost/default.nix @@ -25,4 +25,5 @@ in { boost182 = makeBoost ./1.82.nix; boost183 = makeBoost ./1.83.nix; boost184 = makeBoost ./1.84.nix; + boost185 = makeBoost ./1.85.nix; } diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index fadf478e037f..9bb0967bd5c6 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorHash = "sha256-McSmG+fMO8/T/bJR6YAJDYw9pxsWJoj1hcSTPv/wMsI="; + vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY="; proxyVendor = true; # hack to get both go and cmake configure phase diff --git a/nixpkgs/pkgs/development/libraries/botan/3.0.nix b/nixpkgs/pkgs/development/libraries/botan/3.0.nix index 4c0eae63493a..d55d7edfb74c 100644 --- a/nixpkgs/pkgs/development/libraries/botan/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.2"; + baseVersion = "3.4"; revision = "0"; - hash = "sha256-BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; + hash = "sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc="; }) diff --git a/nixpkgs/pkgs/development/libraries/box2d/default.nix b/nixpkgs/pkgs/development/libraries/box2d/default.nix index 84e2dbc05644..c2611a8b8dff 100644 --- a/nixpkgs/pkgs/development/libraries/box2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/box2d/default.nix @@ -1,37 +1,72 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut, libX11, xorgproto -, libXi, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libGLU +, libGL +, freeglut +, libX11 +, libXcursor +, libXinerama +, libXrandr +, xorgproto +, libXi +, pkg-config +, Carbon +, Cocoa +, Kernel +, OpenGL +, settingsFile ? "include/box2d/b2_settings.h" +}: -stdenv.mkDerivation rec { +let + inherit (lib) cmakeBool optionals; + +in +stdenv.mkDerivation (finalAttrs: { pname = "box2d"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "erincatto"; repo = "box2d"; - rev = "v${version}"; - sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-cL8L+WSTcswj+Bwy8kSOwuEqLyWEM6xa/j/94aBiSck="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; + + buildInputs = [ + libGLU + libGL + freeglut + libX11 + libXcursor + libXinerama + libXrandr + xorgproto + libXi + ] ++ optionals stdenv.isDarwin [ + Carbon Cocoa Kernel OpenGL + ]; cmakeFlags = [ - "-DBOX2D_INSTALL=ON" - "-DBOX2D_BUILD_SHARED=ON" - "-DBOX2D_BUILD_EXAMPLES=OFF" + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.doCheck) ]; prePatch = '' - cd Box2D - substituteInPlace Box2D/Common/b2Settings.h \ - --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' + substituteInPlace ${settingsFile} \ + --replace-fail 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; + # tests are broken on 2.4.1 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677 + doCheck = lib.versionAtLeast finalAttrs.version "2.4.2"; + meta = with lib; { description = "2D physics engine"; homepage = "https://box2d.org/"; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.zlib; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/c-blosc/1.nix b/nixpkgs/pkgs/development/libraries/c-blosc/1.nix index 1060e44af075..0ed22a2620ee 100644 --- a/nixpkgs/pkgs/development/libraries/c-blosc/1.nix +++ b/nixpkgs/pkgs/development/libraries/c-blosc/1.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; - changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${version}"; + changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}"; pkgConfigModules = [ "blosc" ]; diff --git a/nixpkgs/pkgs/development/libraries/c-blosc/2.nix b/nixpkgs/pkgs/development/libraries/c-blosc/2.nix index a431b7f59a85..b49518bead1b 100644 --- a/nixpkgs/pkgs/development/libraries/c-blosc/2.nix +++ b/nixpkgs/pkgs/development/libraries/c-blosc/2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc2"; - version = "2.13.2"; + version = "2.14.3"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc2"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-RNIvg6p/+brW7oboTDH0bbRfIQDaZwtZbbWFbftfWTk="; + sha256 = "sha256-0rizBygyNW9Sr7qnQZoN/Wv2ZIAYuJTQ5tkW6iwIw7Y="; }; # https://github.com/NixOS/nixpkgs/issues/144170 @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A fast, compressed, persistent binary data store library for C"; homepage = "https://www.blosc.org"; - changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${version}"; + changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${finalAttrs.version}"; pkgConfigModules = [ "blosc2" ]; diff --git a/nixpkgs/pkgs/development/libraries/capstone/4.nix b/nixpkgs/pkgs/development/libraries/capstone/4.nix new file mode 100644 index 000000000000..dd31e9feaf62 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/capstone/4.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, fixDarwinDylibNames +}: + +stdenv.mkDerivation rec { + pname = "capstone"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "capstone-engine"; + repo = "capstone"; + rev = version; + sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g="; + }; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + + doCheck = true; + + meta = { + description = "Advanced disassembly library"; + homepage = "http://www.capstone-engine.org"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thoughtpolice ris ]; + mainProgram = "cstool"; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix index ff33c7bd0979..b78b007bc597 100644 --- a/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -7,15 +7,17 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.2"; + version = "5.0.1"; src = fetchFromGitHub { - owner = "aquynh"; + owner = "capstone-engine"; repo = "capstone"; rev = version; - sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g="; + sha256 = "sha256-kKmL5sae9ruWGu1gas1mel9qM52qQOD+zLj8cRE3isg="; }; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/catboost/default.nix b/nixpkgs/pkgs/development/libraries/catboost/default.nix index fc18eef2ca89..6da5885223a6 100644 --- a/nixpkgs/pkgs/development/libraries/catboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/catboost/default.nix @@ -1,8 +1,8 @@ { lib , config -, stdenv , fetchFromGitHub , cmake +, darwin , libiconv , llvmPackages , ninja @@ -13,18 +13,22 @@ , zlib , cudaSupport ? config.cudaSupport , cudaPackages ? {} +, llvmPackages_12 , pythonSupport ? false }: +let + inherit (llvmPackages) stdenv; +in stdenv.mkDerivation (finalAttrs: { pname = "catboost"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-A1zCIqPOW21dHKBQHRtS+/sstZ2o6F8k71lmJFGn0+g="; + hash = "sha256-wn9STnpqX3zmdxPmMYAz9JPdg13Goux76CMaCiqohk8="; }; patches = [ @@ -33,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace cmake/common.cmake \ - --replace "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ - --replace "\''${YASM_BIN}" "${yasm}/bin/yasm" + --replace-fail "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ + --replace-fail "\''${YASM_BIN}" "${yasm}/bin/yasm" shopt -s globstar for cmakelists in **/CMakeLists.*; do @@ -55,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: { (python3Packages.python.withPackages (ps: with ps; [ six ])) ragel yasm + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.cctools ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); @@ -71,17 +77,19 @@ stdenv.mkDerivation (finalAttrs: { ]); env = { - CUDAHOSTCXX = lib.optionalString cudaSupport "${stdenv.cc}/bin/cc"; + # catboost requires clang 14+ for build, but does clang 12 for cuda build. + # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. + # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools + CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc"; NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; NIX_LDFLAGS = "-lc -lm"; }; cmakeFlags = [ - "-DCMAKE_BINARY_DIR=$out" - "-DCMAKE_POSITION_INDEPENDENT_CODE=on" - "-DCATBOOST_COMPONENTS=app;libs${lib.optionalString pythonSupport ";python-package"}" - ] ++ lib.optionals cudaSupport [ - "-DHAVE_CUDA=on" + (lib.cmakeFeature "CMAKE_BINARY_DIR" "$out") + (lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true) + (lib.cmakeFeature "CATBOOST_COMPONENTS" "app;libs${lib.optionalString pythonSupport ";python-package"}") + (lib.cmakeBool "HAVE_CUDA" cudaSupport) ]; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch b/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch index 6f96b7989a58..44411ad4160b 100644 --- a/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch +++ b/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch @@ -1,26 +1,26 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index becd2ad03c..7e3c8c99b1 100644 +index ed6c53b220..5c6fb8f157 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,7 +27,6 @@ cmake_policy(SET CMP0104 OLD) - +@@ -29,7 +29,6 @@ include(cmake/global_flags.cmake) + include(cmake/global_vars.cmake) include(cmake/archive.cmake) include(cmake/common.cmake) -include(cmake/conan.cmake) include(cmake/cuda.cmake) include(cmake/cython.cmake) include(cmake/fbs.cmake) -@@ -37,21 +36,6 @@ include(cmake/recursive_library.cmake) +@@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake) + include(cmake/shared_libs.cmake) include(cmake/swig.cmake) - include(cmake/global_vars.cmake) -if (CMAKE_CROSSCOMPILING) -- include(${CMAKE_BINARY_DIR}/conan_paths.cmake) +- include(${PROJECT_BINARY_DIR}/conan_paths.cmake) -else() - conan_cmake_autodetect(settings) - conan_cmake_install( -- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} -- INSTALL_FOLDER ${CMAKE_BINARY_DIR} +- PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR} +- INSTALL_FOLDER ${PROJECT_BINARY_DIR} - BUILD missing - REMOTE conancenter - SETTINGS ${settings} diff --git a/nixpkgs/pkgs/development/libraries/cista/default.nix b/nixpkgs/pkgs/development/libraries/cista/default.nix index 862a74c596a3..e2f302b5812b 100644 --- a/nixpkgs/pkgs/development/libraries/cista/default.nix +++ b/nixpkgs/pkgs/development/libraries/cista/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "cista"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "felixguendling"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E2B+dNFk0ssKhT9dULNFzpa8auRQ9Q0czuUjX6hxWPw="; + sha256 = "sha256-+DcxnckoXVSc+gXt21fxKkx4J1khLsQPuxYH9CBRrfE="; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://cista.rocks"; description = "A simple, high-performance, zero-copy C++ serialization & reflection library"; license = licenses.mit; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/cjose/default.nix b/nixpkgs/pkgs/development/libraries/cjose/default.nix index 4ecca1290e35..3b0d448a3530 100644 --- a/nixpkgs/pkgs/development/libraries/cjose/default.nix +++ b/nixpkgs/pkgs/development/libraries/cjose/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , doxygen @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; }; + patches = [ + # avoid using empty prototypes; support Clang 15 and XCode 14.3 - https://github.com/OpenIDC/cjose/pull/19 + (fetchpatch { + url = "https://github.com/OpenIDC/cjose/commit/63e90cf464d6a470e26886435e8d7d96a66747f6.patch"; + hash = "sha256-+C5AIejb9InOGiOgUNfuP89J18O71rnq1pXyroxEDFQ="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ jansson openssl ]; nativeCheckInputs = [ check ]; diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix index 8637f5b7ab2d..7f127870032c 100644 --- a/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; - rev = "v${version}"; - hash = "sha256-p1WMp17PCnr50bXDSd6A4Je7AfKVHuLmyEue9221zPs="; + rev = "${version}"; + hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM="; }; nativeBuildInputs = [ cmake ]; @@ -24,9 +24,8 @@ stdenv.mkDerivation rec { lpcnetfreedv ]; - # Install a binary that is used by openwebrx postInstall = '' - install -Dm0755 src/freedv_rx -t $out/bin/ + install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/ ''; # Swap keyword order to satisfy SWIG parser @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; - mainProgram = "freedv_rx"; homepage = "https://www.rowetel.com/codec2.html"; license = licenses.lgpl21Only; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/coost/default.nix b/nixpkgs/pkgs/development/libraries/coost/default.nix index 3d0c15bbc2ef..7a259d44faf0 100644 --- a/nixpkgs/pkgs/development/libraries/coost/default.nix +++ b/nixpkgs/pkgs/development/libraries/coost/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, gitUpdater -, withCurl ? true, withOpenSSL ? true }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + openssl, + gitUpdater, + withCurl ? true, + withOpenSSL ? true, +}: stdenv.mkDerivation rec { pname = "coost"; @@ -21,9 +30,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] - ++ lib.optional withCurl "-DWITH_LIBCURL=ON" - ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] ++ lib.optional withCurl "-DWITH_LIBCURL=ON" ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; passthru.updateScript = gitUpdater { }; @@ -31,7 +40,7 @@ stdenv.mkDerivation rec { description = "A tiny boost library in C++11"; homepage = "https://github.com/idealvin/coost"; license = licenses.mit; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index 029e1cc8d3eb..369630c81243 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 = "4.1.1"; + version = "4.2.1"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-vA1KnHRxIX0lYUfwXTbxjnrrBjFmqp2kwpxBNorVf0Y="; + hash = "sha256-Bg25HL7BDM+SHtM0m7mJ3mAdpFe4kefdiDx5Ek1pQBs="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 09b15ad4da78..da1eecdabab3 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.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-NDv4ZlmrbRoecd0qj/sy+camn4uRTrvte4/84L6oUUg="; + hash = "sha256-PBFQrGGP7hKNMuwkl7q/7/C7v41xqdOYW+pJ70fI4Uo="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix index 310016363253..13776e891ce5 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -52,7 +52,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus glib expat ]; - configureFlags = [ "--disable-ecore" "--disable-tests" ]; + configureFlags = [ + "--disable-ecore" + "--disable-tests" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--disable-examples" + ]; meta = with lib; { homepage = "https://dbus-cplusplus.sourceforge.net"; diff --git a/nixpkgs/pkgs/development/libraries/dconf/default.nix b/nixpkgs/pkgs/development/libraries/dconf/default.nix index 2f8ea0e685e8..ab3804dfcf3b 100644 --- a/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/dconf"; + homepage = "https://gitlab.gnome.org/GNOME/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/nixpkgs/pkgs/development/libraries/dqlite/default.nix index 2746c53e6a01..b5bb2de2c986 100644 --- a/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv -, raft-canonical, sqlite, lxd }: +, raft-canonical, sqlite, lxd-lts }: stdenv.mkDerivation rec { pname = "dqlite"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; passthru.tests = { - inherit lxd; + inherit lxd-lts; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix index c4ed0730cdac..677c7e636986 100644 --- a/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; homepage = "https://google.github.io/draco/"; - changelog = "https://github.com/google/draco/releases/tag/${version}"; + changelog = "https://github.com/google/draco/releases/tag/${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ jansol ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix index be1a20987881..343574f251a8 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { # fails with Out of Memory Error "test/sql/copy/parquet/batched_write/batch_memory_usage.test" # wants http connection + "test/sql/copy/csv/recursive_query_csv.test" "test/sql/copy/csv/test_mixed_lines.test" ] ++ lib.optionals stdenv.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" @@ -108,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { in '' runHook preInstallCheck + (($(ulimit -n) < 1024)) && ulimit -n 1024 HOME="$(mktemp -d)" ${LD_LIBRARY_PATH}="$lib/lib" ./test/unittest ${toString excludes} diff --git a/nixpkgs/pkgs/development/libraries/duckdb/versions.json b/nixpkgs/pkgs/development/libraries/duckdb/versions.json index efb151413e3d..de679be88599 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/versions.json +++ b/nixpkgs/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "0.10.1", - "rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", - "hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg=" + "version": "0.10.2", + "rev": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", + "hash": "sha256-CTZ90KJvLPQqu1FYciEWsxJbvybCjeBsi/12bkfVd9Q=" } diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index f78fb9a19106..0c886a265b63 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20231212"; # upgrade might break the sage interface + version = "20240408"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 # for upstream's explanation of the above url = "https://github.com/JohnCremona/eclib/releases/download/v${version}/eclib-${version}.tar.bz2"; - sha256 = "sha256-MtEWo+NZsN5PZIbCu2GIu4tVPIuDP2GMwllkhOi2FFo="; + sha256 = "sha256-O6kI4gGd5T/LoUFEnKpvqC8DYFv4O/nagJLfU4ravnw="; }; buildInputs = [ pari diff --git a/nixpkgs/pkgs/development/libraries/edencommon/default.nix b/nixpkgs/pkgs/development/libraries/edencommon/default.nix index 68d6e5529157..0690f0f12ebd 100644 --- a/nixpkgs/pkgs/development/libraries/edencommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/edencommon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "edencommon"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebookexperimental"; repo = "edencommon"; rev = "v${version}"; - sha256 = "sha256-KY0vXptzOEJLDjHvGd3T5oiCCvggND2bPBzvll+YBo4="; + sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/embree/default.nix b/nixpkgs/pkgs/development/libraries/embree/default.nix index 419572f3ff16..d956eae27e8d 100644 --- a/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -1,32 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ispc, tbb, glfw, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }: stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.5"; + version = "4.3.1"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80="; + sha256 = "sha256-gQPlk0bDn04s2pncF22m/OpIbzF3NXKkRCZbmxfXEY4="; }; - patches = [ - (fetchpatch { - name = "fixed-compilation-issues-for-arm-aarch64-processor-under-linux.patch"; - url = "https://github.com/embree/embree/commit/82ca6b5ccb7abe0403a658a0e079926478f04cb1.patch"; - hash = "sha256-l9S4PBk+yQUypQ22l05daD0ruouZKE4VHkGvzKxkH4o="; - }) - ]; - postPatch = '' # Fix duplicate /nix/store/.../nix/store/.../ paths sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \ common/cmake/embree-config.cmake sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake - substituteInPlace common/math/math.h --replace 'defined(__MACOSX__) && !defined(__INTEL_COMPILER)' 0 - substituteInPlace common/math/math.h --replace 'defined(__WIN32__) || defined(__FreeBSD__)' 'defined(__WIN32__) || defined(__FreeBSD__) || defined(__MACOSX__)' + substituteInPlace common/math/emath.h --replace 'defined(__MACOSX__) && !defined(__INTEL_COMPILER)' 0 + substituteInPlace common/math/emath.h --replace 'defined(__WIN32__) || defined(__FreeBSD__)' 'defined(__WIN32__) || defined(__FreeBSD__) || defined(__MACOSX__)' ''; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index fd79b8d7e97f..383a157acbd1 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.6.7"; + version = "2.6.8"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-ocLltZrMoAC7+ySBCvShFlcz1AfyFUeGWI4HbIzVe/w="; + hash = "sha256-9WWSMGLHfz1YhG8FWNIebQfKSkiMWIEt/e+zUgL6x64="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/entt/default.nix b/nixpkgs/pkgs/development/libraries/entt/default.nix index 2f7a86c7f113..8649757b6eda 100644 --- a/nixpkgs/pkgs/development/libraries/entt/default.nix +++ b/nixpkgs/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.13.1"; + version = "3.13.2"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - hash = "sha256-TZuKgpLJCy3uct39SFSVi4b4lyldcfJ3AQNrz3OT3Ow="; + hash = "sha256-botX9T9KEXbctI1hUOt983y2rtWDeXyTonGYpJ6eGr8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch b/nixpkgs/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch deleted file mode 100644 index 9817b1833627..000000000000 --- a/nixpkgs/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch +++ /dev/null @@ -1,252 +0,0 @@ -diff --git a/lib/internal.h b/lib/internal.h -index cce71e4c..a217b3f9 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -31,7 +31,7 @@ - Copyright (c) 2016-2023 Sebastian Pipping <sebastian@pipping.org> - Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com> - Copyright (c) 2019 David Loffredo <loffredo@steptools.com> -- Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> -+ Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> - Licensed under the MIT license: - - Permission is hereby granted, free of charge, to any person obtaining -@@ -162,7 +162,7 @@ const char *unsignedCharToPrintable(unsigned char c); - #endif - - extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c --extern unsigned int g_parseAttempts; // used for testing only -+extern unsigned int g_bytesScanned; // used for testing only - - #ifdef __cplusplus - } -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index aaf0fa9c..6de99d99 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -38,7 +38,7 @@ - Copyright (c) 2022 Jann Horn <jannh@google.com> - Copyright (c) 2022 Sean McBride <sean@rogue-research.com> - Copyright (c) 2023 Owain Davies <owaind@bath.edu> -- Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> -+ Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> - Licensed under the MIT license: - - Permission is hereby granted, free of charge, to any person obtaining -@@ -630,7 +630,7 @@ static unsigned long getDebugLevel(const char *variableName, - : ((*((pool)->ptr)++ = c), 1)) - - XML_Bool g_reparseDeferralEnabledDefault = XML_TRUE; // write ONLY in runtests.c --unsigned int g_parseAttempts = 0; // used for testing only -+unsigned int g_bytesScanned = 0; // used for testing only - - struct XML_ParserStruct { - /* The first member must be m_userData so that the XML_GetUserData -@@ -1017,7 +1017,7 @@ callProcessor(XML_Parser parser, const char *start, const char *end, - return XML_ERROR_NONE; - } - } -- g_parseAttempts += 1; -+ g_bytesScanned += (unsigned)have_now; - const enum XML_Error ret = parser->m_processor(parser, start, end, endPtr); - if (ret == XML_ERROR_NONE) { - // if we consumed nothing, remember what we had on this parse attempt. -diff --git a/tests/basic_tests.c b/tests/basic_tests.c -index 7112a440..a9cc3861 100644 ---- a/tests/basic_tests.c -+++ b/tests/basic_tests.c -@@ -5202,13 +5202,7 @@ START_TEST(test_nested_entity_suspend) { - END_TEST - - /* Regression test for quadratic parsing on large tokens */ --START_TEST(test_big_tokens_take_linear_time) { -- const char *const too_slow_failure_message -- = "Compared to the baseline runtime of the first test, this test has a " -- "slowdown of more than <max_slowdown>. " -- "Please keep increasing the value by 1 until it reliably passes the " -- "test on your hardware and open a bug sharing that number with us. " -- "Thanks in advance!"; -+START_TEST(test_big_tokens_scale_linearly) { - const struct { - const char *pre; - const char *post; -@@ -5220,65 +5214,57 @@ START_TEST(test_big_tokens_take_linear_time) { - {"<e><", "/></e>"}, // big elem name, used to be O(N²) - }; - const int num_cases = sizeof(text) / sizeof(text[0]); -- // For the test we need a <max_slowdown> value that is: -- // (1) big enough that the test passes reliably (avoiding flaky tests), and -- // (2) small enough that the test actually catches regressions. -- const int max_slowdown = 15; - char aaaaaa[4096]; - const int fillsize = (int)sizeof(aaaaaa); - const int fillcount = 100; -+ const unsigned approx_bytes = fillsize * fillcount; // ignore pre/post. -+ const unsigned max_factor = 4; -+ const unsigned max_scanned = max_factor * approx_bytes; - - memset(aaaaaa, 'a', fillsize); - - if (! g_reparseDeferralEnabledDefault) { - return; // heuristic is disabled; we would get O(n^2) and fail. - } --#if ! defined(__linux__) -- if (CLOCKS_PER_SEC < 100000) { -- // Skip this test if clock() doesn't have reasonably good resolution. -- // This workaround is primarily targeting Windows and FreeBSD, since -- // XSI requires the value to be 1.000.000 (10x the condition here), and -- // we want to be very sure that at least one platform in CI can catch -- // regressions (through a failing test). -- return; -- } --#endif - -- clock_t baseline = 0; - for (int i = 0; i < num_cases; ++i) { - XML_Parser parser = XML_ParserCreate(NULL); - assert_true(parser != NULL); - enum XML_Status status; -- set_subtest("max_slowdown=%d text=\"%saaaaaa%s\"", max_slowdown, -- text[i].pre, text[i].post); -- const clock_t start = clock(); -+ set_subtest("text=\"%saaaaaa%s\"", text[i].pre, text[i].post); - - // parse the start text -+ g_bytesScanned = 0; - status = _XML_Parse_SINGLE_BYTES(parser, text[i].pre, - (int)strlen(text[i].pre), XML_FALSE); - if (status != XML_STATUS_OK) { - xml_failure(parser); - } -+ - // parse lots of 'a', failing the test early if it takes too long -+ unsigned past_max_count = 0; - for (int f = 0; f < fillcount; ++f) { - status = _XML_Parse_SINGLE_BYTES(parser, aaaaaa, fillsize, XML_FALSE); - if (status != XML_STATUS_OK) { - xml_failure(parser); - } -- // i == 0 means we're still calculating the baseline value -- if (i > 0) { -- const clock_t now = clock(); -- const clock_t clocks_so_far = now - start; -- const int slowdown = clocks_so_far / baseline; -- if (slowdown >= max_slowdown) { -- fprintf( -- stderr, -- "fill#%d: clocks_so_far=%d baseline=%d slowdown=%d max_slowdown=%d\n", -- f, (int)clocks_so_far, (int)baseline, slowdown, max_slowdown); -- fail(too_slow_failure_message); -- } -+ if (g_bytesScanned > max_scanned) { -+ // We're not done, and have already passed the limit -- the test will -+ // definitely fail. This block allows us to save time by failing early. -+ const unsigned pushed -+ = (unsigned)strlen(text[i].pre) + (f + 1) * fillsize; -+ fprintf( -+ stderr, -+ "after %d/%d loops: pushed=%u scanned=%u (factor ~%.2f) max_scanned: %u (factor ~%u)\n", -+ f + 1, fillcount, pushed, g_bytesScanned, -+ g_bytesScanned / (double)pushed, max_scanned, max_factor); -+ past_max_count++; -+ // We are failing, but allow a few log prints first. If we don't reach -+ // a count of five, the test will fail after the loop instead. -+ assert_true(past_max_count < 5); - } - } -+ - // parse the end text - status = _XML_Parse_SINGLE_BYTES(parser, text[i].post, - (int)strlen(text[i].post), XML_TRUE); -@@ -5286,18 +5272,14 @@ START_TEST(test_big_tokens_take_linear_time) { - xml_failure(parser); - } - -- // how long did it take in total? -- const clock_t end = clock(); -- const clock_t taken = end - start; -- if (i == 0) { -- assert_true(taken > 0); // just to make sure we don't div-by-0 later -- baseline = taken; -- } -- const int slowdown = taken / baseline; -- if (slowdown >= max_slowdown) { -- fprintf(stderr, "taken=%d baseline=%d slowdown=%d max_slowdown=%d\n", -- (int)taken, (int)baseline, slowdown, max_slowdown); -- fail(too_slow_failure_message); -+ assert_true(g_bytesScanned > approx_bytes); // or the counter isn't working -+ if (g_bytesScanned > max_scanned) { -+ fprintf( -+ stderr, -+ "after all input: scanned=%u (factor ~%.2f) max_scanned: %u (factor ~%u)\n", -+ g_bytesScanned, g_bytesScanned / (double)approx_bytes, max_scanned, -+ max_factor); -+ fail("scanned too many bytes"); - } - - XML_ParserFree(parser); -@@ -5774,19 +5756,17 @@ START_TEST(test_varying_buffer_fills) { - fillsize[2], fillsize[3]); - XML_Parser parser = XML_ParserCreate(NULL); - assert_true(parser != NULL); -- g_parseAttempts = 0; - - CharData storage; - CharData_Init(&storage); - XML_SetUserData(parser, &storage); - XML_SetStartElementHandler(parser, start_element_event_handler); - -+ g_bytesScanned = 0; - int worstcase_bytes = 0; // sum of (buffered bytes at each XML_Parse call) -- int scanned_bytes = 0; // sum of (buffered bytes at each actual parse) - int offset = 0; - while (*fillsize >= 0) { - assert_true(offset + *fillsize <= document_length); // or test is invalid -- const unsigned attempts_before = g_parseAttempts; - const enum XML_Status status - = XML_Parse(parser, &document[offset], *fillsize, XML_FALSE); - if (status != XML_STATUS_OK) { -@@ -5796,28 +5776,20 @@ START_TEST(test_varying_buffer_fills) { - fillsize++; - assert_true(offset <= INT_MAX - worstcase_bytes); // avoid overflow - worstcase_bytes += offset; // we might've tried to parse all pending bytes -- if (g_parseAttempts != attempts_before) { -- assert_true(g_parseAttempts == attempts_before + 1); // max 1/XML_Parse -- assert_true(offset <= INT_MAX - scanned_bytes); // avoid overflow -- scanned_bytes += offset; // we *did* try to parse all pending bytes -- } - } - assert_true(storage.count == 1); // the big token should've been parsed -- assert_true(scanned_bytes > 0); // test-the-test: does our counter work? -+ assert_true(g_bytesScanned > 0); // test-the-test: does our counter work? - if (g_reparseDeferralEnabledDefault) { - // heuristic is enabled; some XML_Parse calls may have deferred reparsing -- const int max_bytes_scanned = -*fillsize; -- if (scanned_bytes > max_bytes_scanned) { -+ const unsigned max_bytes_scanned = -*fillsize; -+ if (g_bytesScanned > max_bytes_scanned) { - fprintf(stderr, -- "bytes scanned in parse attempts: actual=%d limit=%d \n", -- scanned_bytes, max_bytes_scanned); -+ "bytes scanned in parse attempts: actual=%u limit=%u \n", -+ g_bytesScanned, max_bytes_scanned); - fail("too many bytes scanned in parse attempts"); - } -- assert_true(scanned_bytes <= worstcase_bytes); -- } else { -- // heuristic is disabled; every XML_Parse() will have reparsed -- assert_true(scanned_bytes == worstcase_bytes); - } -+ assert_true(g_bytesScanned <= (unsigned)worstcase_bytes); - - XML_ParserFree(parser); - } -@@ -6065,7 +6037,7 @@ make_basic_test_case(Suite *s) { - tcase_add_test__ifdef_xml_dtd(tc_basic, - test_pool_integrity_with_unfinished_attr); - tcase_add_test__if_xml_ge(tc_basic, test_nested_entity_suspend); -- tcase_add_test(tc_basic, test_big_tokens_take_linear_time); -+ tcase_add_test(tc_basic, test_big_tokens_scale_linearly); - tcase_add_test(tc_basic, test_set_reparse_deferral); - tcase_add_test(tc_basic, test_reparse_deferral_is_inherited); - tcase_add_test(tc_basic, test_set_reparse_deferral_on_null_parser); diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix index d2f4aa392cb1..9944277e946b 100644 --- a/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -16,7 +16,7 @@ # files. let - version = "2.6.0"; + version = "2.6.2"; tag = "R_${lib.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -25,14 +25,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-y19ajqIR4cq9Wb4KkzpS48Aswyboak04fY0hjn7kej4="; + hash = "sha256-7hS0xdiQixvsN62TdgfqsYPU2YBqCK3uRyw8MSHSc2Q="; }; - patches = [ - # Fix tests flakiness on some platforms (like aarch64-darwin), should be released in 2.6.1 - ./2.6.0-fix-tests-flakiness.patch - ]; - strictDeps = true; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix index 22f422e25317..fc71ced98101 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.03"; + version = "24.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-O2hnv74Uj3PJCmca9Ynz+jjeJXBw2zbGEWlqax3WfjA="; + sha256 = "sha256-DuQG5AsfLtWHVun9P8iiBqp3xtb67feC5b2gveIRqpA="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/fb303/default.nix b/nixpkgs/pkgs/development/libraries/fb303/default.nix index d1de187ec2c4..6c50819ef146 100644 --- a/nixpkgs/pkgs/development/libraries/fb303/default.nix +++ b/nixpkgs/pkgs/development/libraries/fb303/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fb303"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fb303"; rev = "v${version}"; - sha256 = "sha256-EQpe0REGWUpYg+llsCo4x6vJ7UPdWXk3uPM3b8b9Uf0="; + sha256 = "sha256-Jtztb8CTqvRdRjUa3jaouP5PFAwoM4rKLIfgvOyXUIg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/fbthrift/default.nix b/nixpkgs/pkgs/development/libraries/fbthrift/default.nix index 373d01892203..5ac08f2c6cc3 100644 --- a/nixpkgs/pkgs/development/libraries/fbthrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/fbthrift/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "fbthrift"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; rev = "v${version}"; - sha256 = "sha256-vIYXX4NOs2JdhrAJKmIhf4+hQEXHue2Ok7e4cw6yups="; + sha256 = "sha256-iCiiKNDlfKm1Y4SGzcSP6o/OdiRRrj9UEawW6qpBpSY="; }; nativeBuildInputs = [ @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { flex ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.isDarwin then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix index 5c15239541d8..6da6713a7f79 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix @@ -6,13 +6,10 @@ let callPackage ./generic.nix ( { inherit (darwin.apple_sdk.frameworks) - Cocoa - CoreServices - CoreAudio - CoreMedia + AppKit + AudioToolbox AVFoundation - MediaToolbox - VideoDecodeAcceleration + CoreImage VideoToolbox ; } @@ -33,6 +30,11 @@ let version = "6.1.1"; hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; }; + + v7 = { + version = "7.0"; + hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + }; in rec { @@ -48,6 +50,10 @@ rec { ffmpeg_6-headless = mkFFmpeg v6 "headless"; ffmpeg_6-full = mkFFmpeg v6 "full"; + ffmpeg_7 = mkFFmpeg v7 "small"; + ffmpeg_7-headless = mkFFmpeg v7 "headless"; + ffmpeg_7-full = mkFFmpeg v7 "full"; + # Please make sure this is updated to the latest version on the next major # update to ffmpeg # Packages which use ffmpeg as a library, should pin to the relevant major diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 6dba78cad219..bdc0cdd5ffa4 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -30,25 +30,33 @@ , withFullDeps ? ffmpegVariant == "full" , fetchgit -, fetchpatch +, fetchpatch2 # Feature flags , withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT , withAom ? withFullDeps # AV1 reference encoder +, withAppKit ? withHeadlessDeps && stdenv.isDarwin # Apple AppKit framework , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering +, withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox +, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library , withBzlib ? withHeadlessDeps , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting -, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV)) +, withCoreImage ? withHeadlessDeps && stdenv.isDarwin # Apple CoreImage framework +, withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps +, withCuvid ? withHeadlessDeps && withNvcodec , 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 +, withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing +, withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing , withFdkAac ? withFullDeps && (!withGPL || withUnfree) # Fraunhofer FDK AAC de/encoder +, withNvcodec ? withHeadlessDeps && (with stdenv; !isDarwin && !isAarch32 && !hostPlatform.isRiscV && hostPlatform == buildPlatform) # dynamically linked Nvidia code , withFlite ? withFullDeps # Voice Synthesis , withFontconfig ? withHeadlessDeps # Needed for drawtext filter , withFreetype ? withHeadlessDeps # Needed for drawtext filter @@ -66,22 +74,24 @@ , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer -, withNvdec ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) -, withNvenc ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) +, withNvdec ? withHeadlessDeps && withNvcodec +, withNvenc ? withHeadlessDeps && withNvcodec , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps , withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder , withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder -, withOpengl ? false # OpenGL rendering +, withOpengl ? withFullDeps && !stdenv.isDarwin # OpenGL rendering , withOpenh264 ? withFullDeps # H.264/AVC encoder , withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder , withOpenmpt ? withFullDeps # Tracked music files decoder , withOpus ? withHeadlessDeps # Opus de/encoder , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support +, withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation +, withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) -, withRtmp ? false # RTMP[E] support +, withRtmp ? withFullDeps # RTMP[E] support , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol , withSdl2 ? withSmallDeps , withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" @@ -91,16 +101,18 @@ , withSsh ? withHeadlessDeps # SFTP protocol , withSvg ? withFullDeps # SVG protocol , withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) -, withTensorflow ? false # Tensorflow dnn backend support +, withTensorflow ? false # Tensorflow dnn backend support (Increases closure size by ~390 MiB) , withTheora ? withHeadlessDeps # Theora encoder , withV4l2 ? withHeadlessDeps && stdenv.isLinux # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration +, withVideoToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple VideoToolbox , withVidStab ? withFullDeps && withGPL # Video stabilization , withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists +, withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding , withVulkan ? withSmallDeps && !stdenv.isDarwin , withWebp ? withFullDeps # WebP encoder @@ -111,6 +123,8 @@ , withXcbShape ? withFullDeps # X11 grabbing shape rendering , withXcbShm ? withFullDeps # X11 grabbing shm communication , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering +, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC decoding +, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC encoding , withXlib ? withFullDeps # Xlib support , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists @@ -147,7 +161,7 @@ * Program options */ , buildFfmpeg ? withHeadlessDeps # Build ffmpeg executable -, buildFfplay ? withFullDeps # Build ffplay executable +, buildFfplay ? withSmallDeps # Build ffplay executable , buildFfprobe ? withHeadlessDeps # Build ffprobe executable , buildQtFaststart ? withFullDeps # Build qt-faststart executable , withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart @@ -223,6 +237,8 @@ , libcaca , libdc1394 , libdrm +, libdvdnav +, libdvdread , libGL , libGLU , libiconv @@ -246,6 +262,7 @@ , libvdpau , libvmaf , libvorbis +, libvpl , libvpx , libwebp , libX11 @@ -261,6 +278,8 @@ , opencore-amr , openh264 , openjpeg +, qrencode +, quirc , rav1e , rtmpdump , samba @@ -277,6 +296,8 @@ , x264 , x265 , xavs +, xevd +, xeve , xvidcore , xz , zeromq4 @@ -285,13 +306,10 @@ /* * Darwin frameworks */ +, AppKit +, AudioToolbox , AVFoundation -, Cocoa -, CoreAudio -, CoreMedia -, CoreServices -, MediaToolbox -, VideoDecodeAcceleration +, CoreImage , VideoToolbox /* * Testing @@ -328,6 +346,7 @@ assert withGPLv3 -> withGPL && withVersion3; * Build dependencies */ assert withPixelutils -> buildAvutil; +assert !(withMfx && withVpl); # incompatible features /* * Program dependencies */ @@ -351,6 +370,11 @@ assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6 assert buildPostproc -> buildAvutil; assert buildSwscale -> buildAvutil; +/* + * External Library dependencies + */ +assert (withCuda || withCuvid || withNvdec || withNvenc) -> withNvcodec; + stdenv.mkDerivation (finalAttrs: { pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}"); inherit version; @@ -365,25 +389,25 @@ stdenv.mkDerivation (finalAttrs: { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; - patches = map (patch: fetchpatch patch) ([ ] + patches = map (patch: fetchpatch2 patch) ([ ] ++ optionals (versionOlder version "5") [ { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; - hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; + hash = "sha256-agJgzIzrBTQBAypuCmGXXFo7vw6Iodw5Ny5O5QCKCn8="; } { # 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="; + hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY="; } # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. { name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; - hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; + hash = "sha256-vqqVACjbCcGL9Qvmg1QArSKqVmOqr8BEr+OxTBDt6mA="; postFetch = '' substituteInPlace "$out" \ --replace libavformat/seek.c libavformat/utils.c \ @@ -391,20 +415,26 @@ stdenv.mkDerivation (finalAttrs: { ''; } ] - ++ (lib.optional (lib.versionAtLeast version "6" && lib.versionOlder version "6.1") - { # this can be removed post 6.1 - name = "fix_aacps_tablegen"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/814178f92647be2411516bbb82f48532373d2554"; - hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; - } - ) - ++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; - hash = "sha256-Ittka0mId1N/BwJ0FQ0ygpTSS6Y11u2SjWDpbGN+KXo="; + hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c="; + } + { + name = "fix_vulkan_av1"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; + hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; + } + ]) + ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + { + # Will likely be obsolete in >7.0 + name = "fate_avoid_dependency_on_samples"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834"; + hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I="; } - )); + ])); configurePlatforms = []; setOutputFlags = false; # Only accepts some of them @@ -490,22 +520,32 @@ stdenv.mkDerivation (finalAttrs: { */ (enableFeature withAlsa "alsa") (enableFeature withAom "libaom") + (enableFeature withAppKit "appkit") ] ++ optionals (versionAtLeast version "6.1") [ (enableFeature withAribcaption "libaribcaption") ] ++ [ (enableFeature withAss "libass") + (enableFeature withAudioToolbox "audiotoolbox") + (enableFeature withAvFoundation "avfoundation") (enableFeature withBluray "libbluray") (enableFeature withBs2b "libbs2b") (enableFeature withBzlib "bzlib") (enableFeature withCaca "libcaca") (enableFeature withCelt "libcelt") (enableFeature withChromaprint "chromaprint") + (enableFeature withCoreImage "coreimage") (enableFeature withCuda "cuda") (enableFeature withCudaLLVM "cuda-llvm") + (enableFeature withCuvid "cuvid") (enableFeature withDav1d "libdav1d") (enableFeature withDc1394 "libdc1394") (enableFeature withDrm "libdrm") + ] ++ optionals (versionAtLeast version "7") [ + (enableFeature withDvdnav "libdvdnav") + (enableFeature withDvdread "libdvdread") + ] ++ [ (enableFeature withFdkAac "libfdk-aac") + (enableFeature withNvcodec "ffnvcodec") (enableFeature withFlite "libflite") (enableFeature withFontconfig "fontconfig") (enableFeature withFontconfig "libfontconfig") @@ -526,7 +566,6 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withModplug "libmodplug") (enableFeature withMp3lame "libmp3lame") (enableFeature withMysofa "libmysofa") - (enableFeature withNvdec "cuvid") (enableFeature withNvdec "nvdec") (enableFeature withNvenc "nvenc") (enableFeature withOpenal "openal") @@ -542,6 +581,10 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withPlacebo "libplacebo") ] ++ [ (enableFeature withPulse "libpulse") + ] ++ optionals (versionAtLeast version "7") [ + (enableFeature withQrencode "libqrencode") + (enableFeature withQuirc "libquirc") + ] ++ [ (enableFeature withRav1e "librav1e") (enableFeature withRtmp "librtmp") (enableFeature withSamba "libsmbclient") @@ -561,6 +604,10 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withV4l2M2m "v4l2-m2m") (enableFeature withVaapi "vaapi") (enableFeature withVdpau "vdpau") + ] ++ optionals (versionAtLeast version "6.0") [ + (enableFeature withVpl "libvpl") + ] ++ [ + (enableFeature withVideoToolbox "videotoolbox") (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 (enableFeature withVmaf "libvmaf") (enableFeature withVoAmrwbenc "libvo-amrwbenc") @@ -575,6 +622,10 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withXcbShape "libxcb-shape") (enableFeature withXcbShm "libxcb-shm") (enableFeature withXcbxfixes "libxcb-xfixes") + ] ++ optionals (versionAtLeast version "7") [ + (enableFeature withXevd "libxevd") + (enableFeature withXeve "libxeve") + ] ++ [ (enableFeature withXlib "xlib") (enableFeature withXml2 "libxml2") (enableFeature withXvid "libxvid") @@ -615,18 +666,25 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAom [ libaom ] + ++ optionals withAppKit [ AppKit ] ++ optionals withAribcaption [ libaribcaption ] ++ optionals withAss [ libass ] + ++ optionals withAudioToolbox [ AudioToolbox ] + ++ optionals withAvFoundation [ AVFoundation ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] ++ optionals withChromaprint [ chromaprint ] + ++ optionals withCoreImage [ CoreImage ] ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDrm [ libdrm ] + ++ optionals withDvdnav [ libdvdnav ] + ++ optionals withDvdread [ libdvdread ] ++ optionals withFdkAac [ fdk_aac ] + ++ optionals withNvcodec [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withFlite [ flite ] ++ optionals withFontconfig [ fontconfig ] ++ optionals withFreetype [ freetype ] @@ -644,7 +702,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withModplug [ libmodplug ] ++ optionals withMp3lame [ lame ] ++ optionals withMysofa [ libmysofa ] - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withOgg [ libogg ] ++ optionals withOpenal [ openal ] ++ optionals withOpencl [ ocl-icd opencl-headers ] @@ -656,6 +713,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withOpus [ libopus ] ++ optionals withPlacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] ++ optionals withPulse [ libpulseaudio ] + ++ optionals withQrencode [ qrencode ] + ++ optionals withQuirc [ quirc ] ++ optionals withRav1e [ rav1e ] ++ optionals withRtmp [ rtmpdump ] ++ optionals withSamba [ samba ] @@ -672,10 +731,12 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withV4l2 [ libv4l ] ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] ++ optionals withVdpau [ libvdpau ] + ++ optionals withVideoToolbox [ VideoToolbox ] ++ optionals withVidStab [ vid-stab ] ++ optionals withVmaf [ libvmaf ] ++ optionals withVoAmrwbenc [ vo-amrwbenc ] ++ optionals withVorbis [ libvorbis ] + ++ optionals withVpl [ libvpl ] ++ optionals withVpx [ libvpx ] ++ optionals withVulkan [ vulkan-headers vulkan-loader ] ++ optionals withWebp [ libwebp ] @@ -683,23 +744,15 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withX265 [ x265 ] ++ optionals withXavs [ xavs ] ++ optionals withXcb [ libxcb ] + ++ optionals withXevd [ xevd ] + ++ optionals withXeve [ xeve ] ++ optionals withXlib [ libX11 libXv libXext ] ++ optionals withXml2 [ libxml2 ] ++ optionals withXvid [ xvidcore ] ++ optionals withZimg [ zimg ] ++ optionals withZlib [ zlib ] ++ optionals withZmq [ zeromq4 ] - ++ optionals stdenv.isDarwin [ - # TODO fine-grained flags - AVFoundation - Cocoa - CoreAudio - CoreMedia - CoreServices - MediaToolbox - VideoDecodeAcceleration - VideoToolbox - ]; + ; buildFlags = [ "all" ] ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable @@ -767,7 +820,16 @@ stdenv.mkDerivation (finalAttrs: { ++ optional withGPLv3 gpl3Plus ++ optional withUnfree unfreeRedistributable ++ optional (withGPL && withUnfree) unfree; - pkgConfigModules = [ "libavutil" ]; + pkgConfigModules = [ ] + ++ optional buildAvcodec "libavcodec" + ++ optional buildAvdevice "libavdevice" + ++ optional buildAvfilter "libavfilter" + ++ optional buildAvformat "libavformat" + ++ optional buildAvresample "libavresample" + ++ optional buildAvutil "libavutil" + ++ optional buildPostproc "libpostproc" + ++ optional buildSwresample "libswresample" + ++ optional buildSwscale "libswscale"; platforms = platforms.all; # See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658 broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit; diff --git a/nixpkgs/pkgs/development/libraries/fizz/default.nix b/nixpkgs/pkgs/development/libraries/fizz/default.nix index 282400948769..cc7a249cf76f 100644 --- a/nixpkgs/pkgs/development/libraries/fizz/default.nix +++ b/nixpkgs/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-17EELvRrWhUprxvm1Ur0FYNimvY1qgK0YH8ehxtLpxM="; + hash = "sha256-IHWotiVUjGOvebXy4rwsh8U8UMxTrF1VaqXzZMjojiM="; }; nativeBuildInputs = [ cmake ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++14 implementation of the TLS-1.3 standard"; homepage = "https://github.com/facebookincubator/fizz"; - changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${version}"; + changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${finalAttrs.version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ pierreis kylesferrazza ]; diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 1786d84e7a4b..cb2fc48c31de 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.5"; + version = "1.14.6"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-W3DGTOesE04eoIARJW5COuXFTydyl0QVg/d9AT8n/6w="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-U482ssb4xw7v0S0TrVsa2DCCAQaovTqfa45NnegeSUY="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/flint/default.nix b/nixpkgs/pkgs/development/libraries/flint/default.nix index eeb2cf1127e4..eeb928be8710 100644 --- a/nixpkgs/pkgs/development/libraries/flint/default.nix +++ b/nixpkgs/pkgs/development/libraries/flint/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , gmp -, mpir , mpfr , ntl , openblas ? null, blas, lapack @@ -22,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ gmp - mpir mpfr ntl ] ++ lib.optionals withBlas [ @@ -35,7 +33,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp=${gmp}" - "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-ntl=${ntl}" ] ++ lib.optionals withBlas [ diff --git a/nixpkgs/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix index c100a8862d5c..8df1c9585450 100644 --- a/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; - homepage = "https://wiki.gnome.org/Projects/Folks"; + homepage = "https://gitlab.gnome.org/GNOME/folks"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index eb0372a40aff..9dd6bbeaa55e 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, overrideSDK , fetchFromGitHub , boost , cmake @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-+z1wuEOgr7CMHFnOn5gLm9mtVH7mVURLstOoDqzxKbk="; + sha256 = "sha256-INvWTw27fmVbKQIT9ebdRGMCOIzpc/NepRN2EnKLJx0="; }; nativeBuildInputs = [ @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/issues/144170 "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" + ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; # split outputs to reduce downstream closure sizes diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index cfe0a21e1d35..a03f7446b0ab 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -1,5 +1,11 @@ -{ runCommand, stdenv, lib, libxslt, fontconfig, dejavu_fonts, fontDirectories -, impureFontDirectories ? [ +{ runCommand, stdenv, lib, libxslt, fontconfig, dejavu_fonts }: + +let fontconfig_ = fontconfig; in +{ + fontconfig ? fontconfig_ + # an array of fonts, e.g. `[ pkgs.dejavu_fonts.minimal ]` +, fontDirectories + , impureFontDirectories ? [ # nix user profile "~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts" ] @@ -11,7 +17,8 @@ # darwin paths ++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] # nix default profile - ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] }: + ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] +}: runCommand "fonts.conf" { diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index df7328b2b043..bc6d6a583ea0 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg="; + hash = "sha256-Vn986RPyIhkd2n4cIh1eJyo4cVL+9srL2Xdn/qaLYT4="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gcr/4.nix b/nixpkgs/pkgs/development/libraries/gcr/4.nix index 243663e430d5..ea1dbf99f273 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/4.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/4.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "nOqtKShLqRm5IW4oiMGOxnJAwsk7OkhWvFSIu8Hzo4M="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config meson @@ -49,7 +51,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnupg libgcrypt libtasn1 pango @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" + "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon diff --git a/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix index 5a388246c154..11d695e77499 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "utEPPFU6DhhUZJq1nFskNNoiyhpUrmE48fU5YVZ+Grc="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config meson @@ -46,7 +48,6 @@ stdenv.mkDerivation rec { wrapGAppsHook vala shared-mime-info - gnupg openssh ]; @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" + "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" ] ++ lib.optionals (!systemdSupport) [ "-Dsystemd=disabled" ]; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 6c298ac0e1d9..b059620536c6 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -80,13 +80,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.8.4"; + version = "3.8.5"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-R9VLof13OXPbWGHOG1Q4WZWSPoF739C6WuNWxoIwKTw="; + hash = "sha256-Z+mYlyOX9vJ772qwZMQfCbD/V7RL6+9JLHTzoZ55ot0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index 74eb0f05d3f2..ea3fd6e1ac78 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.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GmVekTySfSOIWkKLdVuhhtJFQBBBfHBj410jNUfSrkc="; + sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index fc3cff98d7e8..e24f519d1cc3 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + # https://github.com/libgeos/geos/issues/930 + cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" + ]; + doCheck = true; passthru.tests = { diff --git a/nixpkgs/pkgs/development/libraries/getdns/default.nix b/nixpkgs/pkgs/development/libraries/getdns/default.nix index 95844e36f3a0..96ebc4fb865d 100644 --- a/nixpkgs/pkgs/development/libraries/getdns/default.nix +++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix @@ -86,7 +86,7 @@ in rec { Privacy resolver increasing end user privacy. Stubby is developed by the getdns team. ''; - homepage = "https://dnsprivacy.org/wiki/x/JYAT"; + homepage = "https://dnsprivacy.org/dns_privacy_daemon_-_stubby/"; }; }; diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 4a346fdcffcd..9753f78ec83e 100644 --- a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/gexiv2"; + homepage = "https://gitlab.gnome.org/GNOME/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix index d84dd96ce2f4..c3c41d971beb 100644 --- a/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GFBGraph"; + homepage = "https://gitlab.gnome.org/GNOME/libgfbgraph"; description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/giflib/default.nix b/nixpkgs/pkgs/development/libraries/giflib/default.nix index a73d12061250..9c24d11d4abc 100644 --- a/nixpkgs/pkgs/development/libraries/giflib/default.nix +++ b/nixpkgs/pkgs/development/libraries/giflib/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # Build dll libraries. (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=4cf1e519bcf51338dc607d23388fca47d71790c0"; - sha256 = "KyJi3eqH/Ae+guEK6znraZI5+IPImaoYoW5NTkCvjsg="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=b7311edf54824ac797c7916cd3ddc3a4b2368a19"; + hash = "sha256-bBx7lw7FWtxZJ+E9AAbKIpCGcJnS5lrGpjYcv/zBtKk="; }) # Install executables. diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 014e5f7e9f0e..5e0b6adbb226 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -1,47 +1,54 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames -, waylandSupport ? false, extra-cmake-modules, wayland -, wayland-protocols, libxkbcommon +, extra-cmake-modules, wayland +, wayland-scanner, wayland-protocols, libxkbcommon }: stdenv.mkDerivation rec { - version = "3.3.10"; + version = "3.4"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-kTRXsfQ+9PFurG3ffz0lwnITAYAXtNl3h/3O6FSny5o="; + sha256 = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0="; }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = lib.optional (!waylandSupport) ./x11.patch; + patches = ./x11.patch; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ OpenGL ] ++ lib.optionals stdenv.isLinux [ libGL ]; - nativeBuildInputs = [ cmake ] + nativeBuildInputs = [ cmake extra-cmake-modules ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ lib.optional waylandSupport extra-cmake-modules; + ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; buildInputs = lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] - ++ lib.optionals (stdenv.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon ] - ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ libX11 libXrandr libXinerama libXcursor libXi libXext ]; + ++ lib.optionals stdenv.isLinux [ + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" - ] ++ lib.optionals waylandSupport [ - "-DGLFW_USE_WAYLAND=ON" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" ]; - postPatch = lib.optionalString waylandSupport '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" ''; diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index d646830c771f..39e17a894cb7 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.78.0"; + version = "2.78.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Uv5M6T99xRM0sQKJRZmFjSPIplrEoRELMJIFZdaNOro="; + sha256 = "5I8t27BJgyy7CSMFKcXkXayp8N8O2jJfgy9zeYWb8J8="; }; patches = [ @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { }) ./installed-tests-path.patch + + # pkcs11 tests provide a relative path that gnutls of course isn't able to + # load, resulting in test failures + # https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/certificate.c#L926 + # https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/connection.c#L3380 + ./disable-pkcs11-tests.patch ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch b/nixpkgs/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch new file mode 100644 index 000000000000..43a37878b56c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 0b3b8c0..7f6ce09 100644 +--- a/meson.build ++++ b/meson.build +@@ -86,7 +86,7 @@ if gnutls_dep.found() + backends += ['gnutls'] + # test-specific, maybe move to tls/tests + if cc.has_function('gnutls_pkcs11_init', prefix: '#include <gnutls/pkcs11.h>', dependencies: gnutls_dep) +- config_h.set10('HAVE_GNUTLS_PKCS11', true) ++ config_h.set10('HAVE_GNUTLS_PKCS11', false) + endif + endif + diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 7c14141554fb..cd03315c0b3c 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -24,14 +24,6 @@ assert stdenv.isLinux -> util-linuxMinimal != null; -/* - * TODO: - * Use --enable-installed-tests for GNOME-related packages, - and use them as a separately installed tests run by Hydra - (they should test an already installed package) - https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests - * Support org.freedesktop.Application, including D-Bus activation from desktop files -*/ let # Some packages don't get "Cflags" from pkg-config correctly # and then fail to build when directly including like <glib/...>. @@ -282,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C library of programming buildings blocks"; - homepage = "https://wiki.gnome.org/Projects/GLib"; + homepage = "https://gitlab.gnome.org/GNOME/glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); pkgConfigModules = [ diff --git a/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch b/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch index b7658b59fb1e..100bf31c3b00 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch +++ b/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch @@ -1,4 +1,4 @@ -From cdd0c4b168fe228de97778556cea5c0f936e0e79 Mon Sep 17 00:00:00 2001 +From e207c3dbcff1d3d09c60eec99b6fec2a698b01bd Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Fri, 22 Jul 2022 22:11:07 -0700 Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed @@ -22,10 +22,10 @@ Co-authored-by: Maximilian Bosch <maximilian@mbosch.me> 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debug/Makefile b/debug/Makefile -index 52f9a7852c..22e4ae5461 100644 +index 3903cc97a3..b041acca71 100644 --- a/debug/Makefile +++ b/debug/Makefile -@@ -265,8 +265,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o +@@ -343,8 +343,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o $(objpfx)xtrace: xtrace.sh rm -f $@.new @@ -38,20 +38,20 @@ index 52f9a7852c..22e4ae5461 100644 && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/debug/xtrace.sh b/debug/xtrace.sh -index 3d1f2af43a..eb2ba7ad4a 100755 +index 77ec1d84df..5614404a71 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1999-2023 Free Software Foundation, Inc. + # Copyright (C) 1999-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/elf/Makefile b/elf/Makefile -index 0d19964d42..ee8ee1cd41 100644 +index 5d78b659ce..a2145d7b64 100644 --- a/elf/Makefile +++ b/elf/Makefile -@@ -250,7 +250,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ +@@ -249,7 +249,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ $(common-objpfx)libc_nonshared.a $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make @@ -61,7 +61,7 @@ index 0d19964d42..ee8ee1cd41 100644 -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ -e 's%@PREFIX@%$(prefix)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -@@ -1396,6 +1397,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ +@@ -1392,6 +1393,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ @@ -70,30 +70,30 @@ index 0d19964d42..ee8ee1cd41 100644 ifeq ($(ldd-rewrite-script),no) diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in -index e45dec5894..e09428506e 100644 +index d6b640df66..46111670cd 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1996-2023 Free Software Foundation, Inc. + # Copyright (C) 1996-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/elf/sotruss.sh b/elf/sotruss.sh -index 874a6bed3f..7cc154561e 100755 +index ac1a83984e..2bf17c518e 100755 --- a/elf/sotruss.sh +++ b/elf/sotruss.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 2011-2023 Free Software Foundation, Inc. + # Copyright (C) 2011-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/malloc/Makefile b/malloc/Makefile -index dfb51d344c..574b5e9579 100644 +index c83ade5f10..8dd9174b79 100644 --- a/malloc/Makefile +++ b/malloc/Makefile -@@ -306,8 +306,9 @@ $(objpfx)mtrace: mtrace.pl +@@ -312,8 +312,9 @@ $(objpfx)mtrace: mtrace.pl $(objpfx)memusage: memusage.sh rm -f $@.new @@ -106,17 +106,17 @@ index dfb51d344c..574b5e9579 100644 && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/malloc/memusage.sh b/malloc/memusage.sh -index b1f5848b74..329e36ef8a 100755 +index d2d9d17ea8..2e7efc9049 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1999-2023 Free Software Foundation, Inc. + # Copyright (C) 1999-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/timezone/Makefile b/timezone/Makefile -index 0306c0bca9..de9bbcc815 100644 +index d7acb387ba..c8e203ea3a 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh @@ -130,5 +130,5 @@ index 0306c0bca9..de9bbcc815 100644 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ -- -2.38.4 +2.42.0 diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz deleted file mode 100644 index a07e4f8e1d50..000000000000 --- a/nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz +++ /dev/null Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch b/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch new file mode 100644 index 000000000000..3e0815573f5e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch @@ -0,0 +1,566 @@ +commit 6d1e3fb07b45e2e31e469b16cf21b24bccf8914c +Author: Andreas K. Hüttel <dilfridge@gentoo.org> +Date: Wed Jan 31 02:12:43 2024 +0100 + + Replace advisories directory + + Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> + +diff --git a/ADVISORIES b/ADVISORIES +new file mode 100644 +index 0000000000..d4e33f2df3 +--- /dev/null ++++ b/ADVISORIES +@@ -0,0 +1,2 @@ ++For the GNU C Library Security Advisories, see the git master branch: ++https://sourceware.org/git/?p=glibc.git;a=tree;f=advisories;hb=HEAD +diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 +deleted file mode 100644 +index 3d19c91b6a..0000000000 +--- a/advisories/GLIBC-SA-2023-0001 ++++ /dev/null +@@ -1,14 +0,0 @@ +-printf: incorrect output for integers with thousands separator and width field +- +-When the printf family of functions is called with a format specifier +-that uses an <apostrophe> (enable grouping) and a minimum width +-specifier, the resulting output could be larger than reasonably expected +-by a caller that computed a tight bound on the buffer size. The +-resulting larger than expected output could result in a buffer overflow +-in the printf family of functions. +- +-CVE-Id: CVE-2023-25139 +-Public-Date: 2023-02-02 +-Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37) +-Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38) +-Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4) +diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002 +deleted file mode 100644 +index 5122669a64..0000000000 +--- a/advisories/GLIBC-SA-2023-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Stack read overflow in no-aaaa mode +- +-If the system is configured in no-aaaa mode via /etc/resolv.conf, +-getaddrinfo is called for the AF_UNSPEC address family, and a DNS +-response is received over TCP that is larger than 2048 bytes, +-getaddrinfo may potentially disclose stack contents via the returned +-address data, or crash. +- +-CVE-Id: CVE-2023-4527 +-Public-Date: 2023-09-12 +-Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36) +-Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39) +-Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113) +-Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38) +-Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19) +diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003 +deleted file mode 100644 +index d3aef80348..0000000000 +--- a/advisories/GLIBC-SA-2023-0003 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Potential use-after-free +- +-When an NSS plugin only implements the _gethostbyname2_r and +-_getcanonname_r callbacks, getaddrinfo could use memory that was freed +-during buffer resizing, potentially causing a crash or read or write to +-arbitrary memory. +- +-CVE-Id: CVE-2023-4806 +-Public-Date: 2023-09-12 +-Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39) +-Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004 +deleted file mode 100644 +index 5286a7aa54..0000000000 +--- a/advisories/GLIBC-SA-2023-0004 ++++ /dev/null +@@ -1,16 +0,0 @@ +-tunables: local privilege escalation through buffer overflow +- +-If a tunable of the form NAME=NAME=VAL is passed in the environment of a +-setuid program and NAME is valid, it may result in a buffer overflow, +-which could be exploited to achieve escalated privileges. This flaw was +-introduced in glibc 2.34. +- +-CVE-Id: CVE-2023-4911 +-Public-Date: 2023-10-03 +-Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34) +-Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39) +-Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423) +-Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274) +-Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118) +-Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45) +-Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27) +diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005 +deleted file mode 100644 +index cc4eb90b82..0000000000 +--- a/advisories/GLIBC-SA-2023-0005 ++++ /dev/null +@@ -1,18 +0,0 @@ +-getaddrinfo: DoS due to memory leak +- +-The fix for CVE-2023-4806 introduced a memory leak when an application +-calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED +-flags set. +- +-CVE-Id: CVE-2023-5156 +-Public-Date: 2023-09-25 +-Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +-Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421) +-Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272) +-Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116) +-Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42) +-Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24) +diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001 +deleted file mode 100644 +index 28931c75ae..0000000000 +--- a/advisories/GLIBC-SA-2024-0001 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER +-containing a long program name failed to update the required buffer +-size, leading to the allocation and overflow of a too-small buffer on +-the heap. +- +-CVE-Id: CVE-2023-6246 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39) +-Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42) +-Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126) +diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002 +deleted file mode 100644 +index 940bfcf2fc..0000000000 +--- a/advisories/GLIBC-SA-2024-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal used the return value of snprintf/vsnprintf to +-calculate buffer sizes for memory allocation. If these functions (for +-any reason) failed and returned -1, the resulting buffer would be too +-small to hold output. +- +-CVE-Id: CVE-2023-6779 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39) +-Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43) +-Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127) +diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003 +deleted file mode 100644 +index b43a5150ab..0000000000 +--- a/advisories/GLIBC-SA-2024-0003 ++++ /dev/null +@@ -1,13 +0,0 @@ +-syslog: Integer overflow in __vsyslog_internal +- +-__vsyslog_internal calculated a buffer size by adding two integers, but +-did not first check if the addition would overflow. +- +-CVE-Id: CVE-2023-6780 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39) +-Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44) +-Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128) +diff --git a/advisories/README b/advisories/README +deleted file mode 100644 +index 94e68b1350..0000000000 +--- a/advisories/README ++++ /dev/null +@@ -1,73 +0,0 @@ +-GNU C Library Security Advisory Format +-====================================== +- +-Security advisories in this directory follow a simple git commit log +-format, with a heading and free-format description augmented with tags +-to allow parsing key information. References to code changes are +-specific to the glibc repository and follow a specific format: +- +- Tag-name: <commit-ref> (release-version) +- +-The <commit-ref> indicates a specific commit in the repository. The +-release-version indicates the publicly consumable release in which this +-commit is known to exist. The release-version is derived from the +-git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and +-is of the form 2.34-NNN. If the -NNN suffix is absent, it means that +-the change is in that release tarball, otherwise the change is on the +-release/2.YY/master branch and not in any released tarball. +- +-The following tags are currently being used: +- +-CVE-Id: +-This is the CVE-Id assigned under the CVE Program +-(https://www.cve.org/). +- +-Public-Date: +-The date this issue became publicly known. +- +-Vulnerable-Commit: +-The commit that introduced this vulnerability. There could be multiple +-entries, one for each release branch in the glibc repository; the +-release-version portion of this tag should tell you which branch this is +-on. +- +-Fix-Commit: +-The commit that fixed this vulnerability. There could be multiple +-entries for each release branch in the glibc repository, indicating that +-all of those commits contributed to fixing that issue in each of those +-branches. +- +-Adding an Advisory +------------------- +- +-An advisory for a CVE needs to be added on the master branch in two steps: +- +-1. Add the text of the advisory without any Fix-Commit tags along with +- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable. +- The advisories directory does not exist in release branches, so keep +- the advisory text commit distinct from the code changes, to ease +- backports. Ask for the GLIBC-SA advisory number from the security +- team. +- +-2. Finish all backports on release branches and then back on the msater +- branch, add all commit refs to the advisory using the Fix-Commit +- tags. Don't bother adding the release-version subscript since the +- next step will overwrite it. +- +-3. Run the process-advisories.sh script in the scripts directory on the +- advisory: +- +- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN +- +- (replace YYYY-NNNN with the actual advisory number). +- +-4. Verify the updated advisory and push the result. +- +-Getting a NEWS snippet from advisories +--------------------------------------- +- +-Run: +- +- scripts/process-advisories.sh news +- +-and copy the content into the NEWS file. + +commit 63295e4fda1f6dab4bf7442706fe303bf283036c +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> +Date: Mon Feb 5 16:10:24 2024 +0000 + + arm: Remove wrong ldr from _dl_start_user (BZ 31339) + + The commit 49d877a80b29d3002887b084eec6676d9f5fec18 (arm: Remove + _dl_skip_args usage) removed the _SKIP_ARGS literal, which was + previously loader to r4 on loader _start. However, the cleanup did not + remove the following 'ldr r4, [sl, r4]' on _dl_start_user, used to check + to skip the arguments after ld self-relocations. + + In my testing, the kernel initially set r4 to 0, which makes the + ldr instruction just read the _GLOBAL_OFFSET_TABLE_. However, since r4 + is a callee-saved register; a different runtime might not zero + initialize it and thus trigger an invalid memory access. + + Checked on arm-linux-gnu. + + Reported-by: Adrian Ratiu <adrian.ratiu@collabora.com> + Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com> + (cherry picked from commit 1e25112dc0cb2515d27d8d178b1ecce778a9d37a) + +diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h +index b857bbc868..dd1a0f6b6e 100644 +--- a/sysdeps/arm/dl-machine.h ++++ b/sysdeps/arm/dl-machine.h +@@ -139,7 +139,6 @@ _start:\n\ + _dl_start_user:\n\ + adr r6, .L_GET_GOT\n\ + add sl, sl, r6\n\ +- ldr r4, [sl, r4]\n\ + @ save the entry point in another register\n\ + mov r6, r0\n\ + @ get the original arg count\n\ + +commit 312e159626b67fe11f39e83e222cf4348a3962f3 +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> +Date: Thu Feb 1 14:29:53 2024 -0300 + + mips: FIx clone3 implementation (BZ 31325) + + For o32 we need to setup a minimal stack frame to allow cprestore + on __thread_start_clone3 (which instruct the linker to save the + gp for PIC). Also, there is no guarantee by kABI that $8 will be + preserved after syscall execution, so we need to save it on the + provided stack. + + Checked on mipsel-linux-gnu. + + Reported-by: Khem Raj <raj.khem@gmail.com> + Tested-by: Khem Raj <raj.khem@gmail.com> + (cherry picked from commit bbd248ac0d75efdef8fe61ea69b1fb25fb95b6e7) + +diff --git a/sysdeps/unix/sysv/linux/mips/clone3.S b/sysdeps/unix/sysv/linux/mips/clone3.S +index e9fec2fa47..481b8ae963 100644 +--- a/sysdeps/unix/sysv/linux/mips/clone3.S ++++ b/sysdeps/unix/sysv/linux/mips/clone3.S +@@ -37,11 +37,6 @@ + + .text + .set nomips16 +-#if _MIPS_SIM == _ABIO32 +-# define EXTRA_LOCALS 1 +-#else +-# define EXTRA_LOCALS 0 +-#endif + #define FRAMESZ ((NARGSAVE*SZREG)+ALSZ)&ALMASK + GPOFF= FRAMESZ-(1*SZREG) + NESTED(__clone3, SZREG, sp) +@@ -68,8 +63,31 @@ NESTED(__clone3, SZREG, sp) + beqz a0, L(error) /* No NULL cl_args pointer. */ + beqz a2, L(error) /* No NULL function pointer. */ + ++#if _MIPS_SIM == _ABIO32 ++ /* Both stack and stack_size on clone_args are defined as uint64_t, and ++ there is no need to handle values larger than to 32 bits for o32. */ ++# if __BYTE_ORDER == __BIG_ENDIAN ++# define CL_STACKPOINTER_OFFSET 44 ++# define CL_STACKSIZE_OFFSET 52 ++# else ++# define CL_STACKPOINTER_OFFSET 40 ++# define CL_STACKSIZE_OFFSET 48 ++# endif ++ ++ /* For o32 we need to setup a minimal stack frame to allow cprestore ++ on __thread_start_clone3. Also there is no guarantee by kABI that ++ $8 will be preserved after syscall execution (so we need to save it ++ on the provided stack). */ ++ lw t0, CL_STACKPOINTER_OFFSET(a0) /* Load the stack pointer. */ ++ lw t1, CL_STACKSIZE_OFFSET(a0) /* Load the stack_size. */ ++ addiu t1, -32 /* Update the stack size. */ ++ addu t2, t1, t0 /* Calculate the thread stack. */ ++ sw a3, 0(t2) /* Save argument pointer. */ ++ sw t1, CL_STACKSIZE_OFFSET(a0) /* Save the new stack size. */ ++#else + move $8, a3 /* a3 is set to 0/1 for syscall success/error + while a4/$8 is returned unmodified. */ ++#endif + + /* Do the system call, the kernel expects: + v0: system call number +@@ -125,7 +143,11 @@ L(thread_start_clone3): + + /* Restore the arg for user's function. */ + move t9, a2 /* Function pointer. */ ++#if _MIPS_SIM == _ABIO32 ++ PTR_L a0, 0(sp) ++#else + move a0, $8 /* Argument pointer. */ ++#endif + + /* Call the user's function. */ + jal t9 + +commit d0724994de40934c552f1f68de89053848a44927 +Author: Xi Ruoyao <xry111@xry111.site> +Date: Thu Feb 22 21:26:55 2024 +0100 + + math: Update mips64 ulps + + Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> + (cherry picked from commit e2a65ecc4b30a797df7dc6529f09b712aa256029) + +diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps +index 78969745b2..933aba4735 100644 +--- a/sysdeps/mips/mips64/libm-test-ulps ++++ b/sysdeps/mips/mips64/libm-test-ulps +@@ -1066,17 +1066,17 @@ double: 1 + ldouble: 1 + + Function: "j0": +-double: 2 ++double: 3 + float: 9 + ldouble: 2 + + Function: "j0_downward": +-double: 5 ++double: 6 + float: 9 + ldouble: 9 + + Function: "j0_towardzero": +-double: 6 ++double: 7 + float: 9 + ldouble: 9 + +@@ -1146,6 +1146,7 @@ float: 6 + ldouble: 8 + + Function: "log": ++double: 1 + float: 1 + ldouble: 1 + + +commit e0910f1d3278f05439fb434ee528fc9be1b6bd5e +Author: Stefan Liebler <stli@linux.ibm.com> +Date: Thu Feb 22 15:03:27 2024 +0100 + + S390: Do not clobber r7 in clone [BZ #31402] + + Starting with commit e57d8fc97b90127de4ed3e3a9cdf663667580935 + "S390: Always use svc 0" + clone clobbers the call-saved register r7 in error case: + function or stack is NULL. + + This patch restores the saved registers also in the error case. + Furthermore the existing test misc/tst-clone is extended to check + all error cases and that clone does not clobber registers in this + error case. + + (cherry picked from commit 02782fd12849b6673cb5c2728cb750e8ec295aa3) + +diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +index 4c882ef2ee..a7a863242c 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S ++++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +@@ -53,6 +53,7 @@ ENTRY(__clone) + br %r14 + error: + lhi %r2,-EINVAL ++ lm %r6,%r7,24(%r15) /* Load registers. */ + j SYSCALL_ERROR_LABEL + PSEUDO_END (__clone) + +diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +index 4eb104be71..c552a6b8de 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S ++++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +@@ -54,6 +54,7 @@ ENTRY(__clone) + br %r14 + error: + lghi %r2,-EINVAL ++ lmg %r6,%r7,48(%r15) /* Restore registers. */ + jg SYSCALL_ERROR_LABEL + PSEUDO_END (__clone) + +diff --git a/sysdeps/unix/sysv/linux/tst-clone.c b/sysdeps/unix/sysv/linux/tst-clone.c +index 470676ab2b..2bc7124983 100644 +--- a/sysdeps/unix/sysv/linux/tst-clone.c ++++ b/sysdeps/unix/sysv/linux/tst-clone.c +@@ -16,12 +16,16 @@ + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +-/* BZ #2386 */ ++/* BZ #2386, BZ #31402 */ + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> + #include <sched.h> ++#include <stackinfo.h> /* For _STACK_GROWS_{UP,DOWN}. */ ++#include <support/check.h> ++ ++volatile unsigned v = 0xdeadbeef; + + int child_fn(void *arg) + { +@@ -30,22 +34,67 @@ int child_fn(void *arg) + } + + static int +-do_test (void) ++__attribute__((noinline)) ++do_clone (int (*fn)(void *), void *stack) + { + int result; ++ unsigned int a = v; ++ unsigned int b = v; ++ unsigned int c = v; ++ unsigned int d = v; ++ unsigned int e = v; ++ unsigned int f = v; ++ unsigned int g = v; ++ unsigned int h = v; ++ unsigned int i = v; ++ unsigned int j = v; ++ unsigned int k = v; ++ unsigned int l = v; ++ unsigned int m = v; ++ unsigned int n = v; ++ unsigned int o = v; ++ ++ result = clone (fn, stack, 0, NULL); ++ ++ /* Check that clone does not clobber call-saved registers. */ ++ TEST_VERIFY (a == v && b == v && c == v && d == v && e == v && f == v ++ && g == v && h == v && i == v && j == v && k == v && l == v ++ && m == v && n == v && o == v); ++ ++ return result; ++} ++ ++static void ++__attribute__((noinline)) ++do_test_single (int (*fn)(void *), void *stack) ++{ ++ printf ("%s (fn=%p, stack=%p)\n", __FUNCTION__, fn, stack); ++ errno = 0; ++ ++ int result = do_clone (fn, stack); ++ ++ TEST_COMPARE (errno, EINVAL); ++ TEST_COMPARE (result, -1); ++} + +- result = clone (child_fn, NULL, 0, NULL); ++static int ++do_test (void) ++{ ++ char st[128 * 1024] __attribute__ ((aligned)); ++ void *stack = NULL; ++#if _STACK_GROWS_DOWN ++ stack = st + sizeof (st); ++#elif _STACK_GROWS_UP ++ stack = st; ++#else ++# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" ++#endif + +- if (errno != EINVAL || result != -1) +- { +- printf ("FAIL: clone()=%d (wanted -1) errno=%d (wanted %d)\n", +- result, errno, EINVAL); +- return 1; +- } ++ do_test_single (child_fn, NULL); ++ do_test_single (NULL, stack); ++ do_test_single (NULL, NULL); + +- puts ("All OK"); + return 0; + } + +-#define TEST_FUNCTION do_test () +-#include "../test-skeleton.c" ++#include <support/test-driver.c> diff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 826d1e9c8389..4d6fb5a54b39 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -36,16 +36,15 @@ , withLinuxHeaders ? false , profilingLibraries ? false , withGd ? false -, withLibcrypt ? false , extraBuildInputs ? [] , extraNativeBuildInputs ? [] , ... } @ args: let - version = "2.38"; - patchSuffix = "-44"; - sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; + version = "2.39"; + patchSuffix = "-5"; + sha256 = "sha256-93vUfPgXDFc2Wue/hmlsEYrbOxINMlnGTFAtPcHi2SY="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -59,14 +58,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.38/master && git describe - glibc-2.38-44-gd37c2b20a4 - $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.39/master && git describe + glibc-2.39-5-ge0910f1d32 + $ git show --minimal --reverse glibc-2.39.. > 2.39-master.patch To compare the archive contents zdiff can be used. - $ zdiff -u 2.38-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz + $ diff -u 2.39-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch */ - ./2.38-master.patch.gz + ./2.39-master.patch /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -96,11 +95,6 @@ stdenv.mkDerivation ({ & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 */ ./reenable_DT_HASH.patch - - /* Retrieved from https://salsa.debian.org/glibc-team/glibc/-/commit/662dbc4f9287139a0d9c91df328a5ba6cc6abee1#0f3c6d67cb8cf5bb35c421c20f828fea97b68edf - Qualys advisory: https://www.qualys.com/2024/01/30/qsort.txt - */ - ./local-qsort-memory-corruption.patch ] /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost every HPC piece of software, without this patch CUDA compilation on ARM @@ -177,8 +171,7 @@ stdenv.mkDerivation ({ # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" ] - ++ lib.optional withGd "--with-gd" - ++ lib.optional withLibcrypt "--enable-crypt"; + ++ lib.optional withGd "--with-gd"; makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" diff --git a/nixpkgs/pkgs/development/libraries/glibc/default.nix b/nixpkgs/pkgs/development/libraries/glibc/default.nix index be3bee081e73..3f7331461fea 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -2,7 +2,6 @@ , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false -, withLibcrypt? false , pkgsBuildBuild , libgcc }: @@ -16,7 +15,7 @@ let in (callPackage ./common.nix { inherit stdenv; } { - inherit withLinuxHeaders withGd profilingLibraries withLibcrypt; + inherit withLinuxHeaders withGd profilingLibraries; pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc"; }).overrideAttrs(previousAttrs: { diff --git a/nixpkgs/pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch b/nixpkgs/pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch deleted file mode 100644 index f7e25c72a61c..000000000000 --- a/nixpkgs/pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rup a/stdlib/qsort.c b/stdlib/qsort.c ---- a/stdlib/qsort.c 2023-07-31 10:54:16.000000000 -0700 -+++ b/stdlib/qsort.c 2024-01-15 09:08:25.596167959 -0800 -@@ -224,7 +224,8 @@ _quicksort (void *const pbase, size_t to - while ((run_ptr += size) <= end_ptr) - { - tmp_ptr = run_ptr - size; -- while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0) -+ while (tmp_ptr != base_ptr -+ && (*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0) - tmp_ptr -= size; - - tmp_ptr += size; - diff --git a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index aee2056a8563..c06e45356ac8 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-online-accounts"; description = "Single sign-on framework for GNOME"; platforms = platforms.unix; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix index 0db1aa27e778..fcf955fbc173 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; - homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-video-effects"; platforms = platforms.unix; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix index e9746271ea27..3f832ad5d577 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.15"; + version = "3.0.18"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo="; + hash = "sha256-fyEslu5mVH7u+1MSZ7ZB5Uc9fYUp8L2Mze/TPPdBP1w="; }; buildInputs = [ pciutils ]; diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 3bef1d935564..728d4a82b23c 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -1,7 +1,7 @@ -{ config -, lib +{ lib , stdenv , fetchurl +, fetchpatch2 , zlib , lzo , libtasn1 @@ -38,6 +38,7 @@ , knot-resolver , ngtcp2-gnutls , ocamlPackages +, pkgsStatic , python3Packages , qemu , rsyslog @@ -57,11 +58,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-90/FlUsn1Oxt+7Ed6ph4iLWxJCiaNwOvytoO5SD0Fz4="; + hash = "sha256-K+pOFUeU8/ABgPoqXFH+iwBax6Mc1YvUTN+n8268Ops="; }; outputs = [ "bin" "dev" "out" ] @@ -73,6 +74,15 @@ stdenv.mkDerivation rec { patches = [ ./nix-ssl-cert-file.patch + # Revert https://gitlab.com/gnutls/gnutls/-/merge_requests/1800 + # dlopen isn't as easy in NixPkgs, as noticed in tests broken by this. + # Without getting the libs into RPATH they won't be found. + (fetchpatch2 { + name = "revert-dlopen-compression.patch"; + url = "https://gitlab.com/gnutls/gnutls/-/commit/8584908d6b679cd4e7676de437117a793e18347c.diff"; + revert = true; + hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM="; + }) ]; # Skip some tests: @@ -87,6 +97,12 @@ stdenv.mkDerivation rec { sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh + '' + lib.optionalString stdenv.hostPlatform.isStatic '' + # Adapted from https://gitlab.com/gnutls/gnutls/-/commit/d214cd4570fb1559a20e941bb7ceac7df52e96d3 + # Can be removed with 3.8.5+. + sed -i lib/nettle/backport/rsa-sign-tr.c -e \ + '/^#include <nettle\/rsa\.h>/i\ + #define nettle_rsa_compute_root_tr _gnutls_nettle_backport_rsa_compute_root_tr' ''; preConfigure = "patchShebangs ."; @@ -112,7 +128,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; - nativeBuildInputs = [ perl pkg-config texinfo ] + nativeBuildInputs = [ perl pkg-config texinfo ] ++ [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; propagatedBuildInputs = [ nettle ] @@ -143,6 +159,7 @@ stdenv.mkDerivation rec { haskell-gnutls = haskellPackages.gnutls; python3-gnutls = python3Packages.python3-gnutls; rsyslog = rsyslog.override { withGnutls = true; }; + static = pkgsStatic.gnutls; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gom/default.nix b/nixpkgs/pkgs/development/libraries/gom/default.nix index 3cb7e9bd6fcb..4d48e0c22740 100644 --- a/nixpkgs/pkgs/development/libraries/gom/default.nix +++ b/nixpkgs/pkgs/development/libraries/gom/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject to SQLite object mapper"; - homepage = "https://wiki.gnome.org/Projects/Gom"; + homepage = "https://gitlab.gnome.org/GNOME/gom"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index 9067ef71ca05..46c7b188c907 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix index 8a07f31b818d..4058412d8305 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; # https://gitlab.gnome.org/GNOME/goocanvas/-/issues/12 maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/default.nix b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix index 03268fb024c6..47ff343ffb63 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/default.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix index 764208008656..ccee4831dc7f 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ bindings for GooCanvas"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvasmm"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix deleted file mode 100644 index 48df439a1efb..000000000000 --- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3 -, runCommand -, makeWrapper -, stress-ng -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "graphene-hardened-malloc"; - version = "12"; - - src = fetchFromGitHub { - owner = "GrapheneOS"; - repo = "hardened_malloc"; - rev = finalAttrs.version; - sha256 = "sha256-ujwzr4njNsf/VTyEq7zKHWxoivU3feavSTx+MLIj1ZM="; - }; - - doCheck = true; - nativeCheckInputs = [ python3 ]; - # these tests cover use as a build-time-linked library - checkTarget = "test"; - - installPhase = '' - install -Dm444 -t $out/include include/* - install -Dm444 -t $out/lib out/libhardened_malloc.so - - mkdir -p $out/bin - substitute preload.sh $out/bin/preload-hardened-malloc --replace "\$dir" $out/lib - chmod 0555 $out/bin/preload-hardened-malloc - ''; - - separateDebugInfo = true; - - passthru = { - ld-preload-tests = stdenv.mkDerivation { - name = "${finalAttrs.pname}-ld-preload-tests"; - inherit (finalAttrs) src; - - nativeBuildInputs = [ makeWrapper ]; - - # reuse the projects tests to cover use with LD_PRELOAD. we have - # to convince the test programs to build as though they're naive - # standalone executables. this includes disabling tests for - # malloc_object_size, which doesn't make sense to use via LD_PRELOAD. - buildPhase = '' - pushd test - make LDLIBS= LDFLAGS=-Wl,--unresolved-symbols=ignore-all CXXFLAGS=-lstdc++ - substituteInPlace test_smc.py \ - --replace 'test_malloc_object_size' 'dont_test_malloc_object_size' \ - --replace 'test_invalid_malloc_object_size' 'dont_test_invalid_malloc_object_size' - popd # test - ''; - - installPhase = '' - mkdir -p $out/test - cp -r test $out/test - - mkdir -p $out/bin - makeWrapper ${python3.interpreter} $out/bin/run-tests \ - --add-flags "-I -m unittest discover --start-directory $out/test" - ''; - }; - tests = { - ld-preload = runCommand "ld-preload-test-run" { } '' - ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${finalAttrs.passthru.ld-preload-tests}/bin/run-tests - touch $out - ''; - # to compensate for the lack of tests of correct normal malloc operation - stress = runCommand "stress-test-run" { } '' - ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ - --no-rand-seed \ - --malloc 8 \ - --malloc-ops 1000000 \ - --verify - touch $out - ''; - }; - }; - - meta = with lib; { - homepage = "https://github.com/GrapheneOS/hardened_malloc"; - description = "Hardened allocator designed for modern systems"; - mainProgram = "preload-hardened-malloc"; - longDescription = '' - This is a security-focused general purpose memory allocator providing the malloc API - along with various extensions. It provides substantial hardening against heap - corruption vulnerabilities yet aims to provide decent overall performance. - ''; - license = licenses.mit; - maintainers = with maintainers; [ ris ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix index 88b83a32918f..4113ee2f5d7c 100644 --- a/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Grilo"; + homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/grilo/default.nix b/nixpkgs/pkgs/development/libraries/grilo/default.nix index 49c957cec5dc..06b524579ac4 100644 --- a/nixpkgs/pkgs/development/libraries/grilo/default.nix +++ b/nixpkgs/pkgs/development/libraries/grilo/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Grilo"; + homepage = "https://gitlab.gnome.org/GNOME/grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 1e8804237b99..bf9b58ec4a09 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; - maintainers = with maintainers; [ lnl7 marsam ]; + maintainers = with maintainers; [ lnl7 ]; homepage = "https://grpc.io/"; platforms = platforms.all; changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/libraries/gsound/default.nix b/nixpkgs/pkgs/development/libraries/gsound/default.nix index 3c7049e92efe..e588a7adca62 100644 --- a/nixpkgs/pkgs/development/libraries/gsound/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsound/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GSound"; + homepage = "https://gitlab.gnome.org/GNOME/gsound"; description = "Small library for playing system sounds"; mainProgram = "gsound-play"; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix index f1b8733cf84b..13a9e4be04b5 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A spell-checking library for GTK applications"; mainProgram = "gspell-app1"; - homepage = "https://wiki.gnome.org/Projects/gspell"; + homepage = "https://gitlab.gnome.org/GNOME/gspell"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 68a6acdc83b1..be56527ec47b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isLinux [ libcap libunwind + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ] ++ lib.optionals stdenv.isDarwin [ Cocoa diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index fbb79028bdaf..19b786a86063 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -39,6 +39,7 @@ , enableJack ? true, libjack2 , enableX11 ? stdenv.isLinux, xorg , ncurses +, enableWayland ? stdenv.isLinux , wayland , wayland-protocols , libgudev @@ -94,7 +95,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals qt6Support (with qt6; [ qtbase qttools - ]) ++ lib.optionals stdenv.isLinux [ + ]) ++ lib.optionals enableWayland [ wayland-protocols ]; @@ -148,6 +149,7 @@ stdenv.mkDerivation rec { libavc1394 libiec61883 libgudev + ] ++ lib.optionals enableWayland [ wayland ] ++ lib.optionals enableJack [ libjack2 diff --git a/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix index f9d41916ecd6..7dd08878bce1 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides integration for GTK applications into the Mac desktop"; license = licenses.lgpl21; - homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration"; + homepage = "https://gitlab.gnome.org/GNOME/gtk-mac-integration"; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.darwin; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 4692bbc97126..b2b156051bf8 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -264,6 +264,6 @@ stdenv.mkDerivation (finalAttrs: { "gtk+-x11-3.0" ]; platforms = platforms.all; - changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; }; }) diff --git a/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix index fb63d4f00c1d..19bcb4ad99c3 100644 --- a/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "https://wiki.gnome.org/Projects/GTK/GtkImageView"; + homepage = "https://gitlab.gnome.org/Archive/gtkimageview"; description = "Image viewer widget for GTK"; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index 704a7c3e9c54..fb5c72e8b34d 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + homepage = "https://gitlab.gnome.org/GNOME/gtksourceview"; pkgConfigModules = [ "gtksourceview-3.0" ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index df66d4b9eb72..1b427957c811 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Source code editing widget for GTK"; - homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + homepage = "https://gitlab.gnome.org/GNOME/gtksourceview"; pkgConfigModules = [ "gtksourceview-4" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index ee2d694c18ff..c54017312e1e 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Source code editing widget for GTK"; - homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + homepage = "https://gitlab.gnome.org/GNOME/gtksourceview"; pkgConfigModules = [ "gtksourceview-5" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/nixpkgs/pkgs/development/libraries/gumbo/default.nix index 68416ef2edc0..118646c619ae 100644 --- a/nixpkgs/pkgs/development/libraries/gumbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/gumbo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "grisha"; + owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 HTML parsing algorithm"; - homepage = "https://github.com/google/gumbo-parser"; + homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; maintainers = [ maintainers.nico202 ]; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix index 7761e3cbd880..44e7c5b5f47c 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GUPnP/"; + homepage = "https://gitlab.gnome.org/GNOME/gupnp-dlna"; description = "Library to ease DLNA-related bits for applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix index 515eeb7de975..27f9174c444d 100644 --- a/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.4.8"; + version = "0.4.9"; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libgusb"; rev = "refs/tags/${version}"; - hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0="; + hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 651dc26ca1ae..e8cae3fa727b 100644 --- a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -1,24 +1,26 @@ -{ lib -, stdenv -, cmake -, doxygen -, fetchFromGitHub -, glib -, glib-networking -, gnutls -, gpgme -, hiredis -, libgcrypt -, libnet -, libpcap -, libssh -, libuuid -, libxcrypt -, libxml2 -, paho-mqtt-c -, pkg-config -, zlib -, freeradius +{ + lib, + stdenv, + cmake, + doxygen, + fetchFromGitHub, + glib, + glib-networking, + gnutls, + gpgme, + hiredis, + libgcrypt, + libnet, + libpcap, + libssh, + libuuid, + libxcrypt, + libxml2, + openldap, + paho-mqtt-c, + pkg-config, + radcli, + zlib, }: stdenv.mkDerivation rec { @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "gvm-libs"; rev = "refs/tags/v${version}"; hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; }; @@ -45,20 +47,19 @@ stdenv.mkDerivation rec { gpgme hiredis libgcrypt - freeradius libnet libpcap libssh libuuid libxcrypt libxml2 + openldap paho-mqtt-c + radcli zlib ]; - cmakeFlags = [ - "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" - ]; + cmakeFlags = [ "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 72ec69bc177b..e558428c67e0 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-EJUB6uuL3j6tsl+rQWTpk/us4pw9d1vKocHlji8V+Ec="; + hash = "sha256-r06nPiWrdIyMBjt4wviOSIM9ubKsNp4pvRFXAueJdV4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/hax11/default.nix b/nixpkgs/pkgs/development/libraries/hax11/default.nix index 608411ec71f1..42851f0cf300 100644 --- a/nixpkgs/pkgs/development/libraries/hax11/default.nix +++ b/nixpkgs/pkgs/development/libraries/hax11/default.nix @@ -44,7 +44,7 @@ multiStdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/CyberShadow/hax11"; description = "Hackbrary to Hook and Augment X11 protocol calls"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres cybershadow ]; platforms = lib.platforms.linux; }; }) diff --git a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix index 4f3e74f5d8a8..f7af4975de56 100644 --- a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -33,6 +33,13 @@ stdenv.mkDerivation rec { src = ./make-zoneinfo-available.diff; inherit tzdata; }) + # The reported version to cmake's find_package() is 3.0.0, but the actual + # version is 3.0.1. This patch fixes that. + (fetchpatch { + name = "fix-cmake-version.patch"; + url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch"; + hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk="; + }) ]; # Tweaks to fix undefined variable substitutions diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix index 6f834147d00b..e22c8c0a52c5 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries-chromium.nix @@ -67,4 +67,13 @@ rec { dictFileName = "de-DE-3-0.bdic"; shortDescription = "German (Germany)"; }; + + /* FRENCH */ + + fr_FR = fr-fr; + fr-fr = mkDictFromChromium { + shortName = "fr-fr"; + dictFileName = "fr-FR-3-0.bdic"; + shortDescription = "French (France)"; + }; } diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index d62f672f0660..78c9ad7fe7b5 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -807,7 +807,7 @@ rec { meta = with lib; { description = "Hunspell dictionary for Dutch (Netherlands) from OpenTaal"; homepage = "https://www.opentaal.org/"; - license = with licenses; [ bsd3 ]; # and/or cc-by-nc-30 + license = with licenses; [ bsd3 /* or */ cc-by-30 ]; maintainers = with maintainers; [ artturin ]; }; }; @@ -828,14 +828,14 @@ rec { th_TH = th-th; th-th = mkDict { pname = "hunspell-dict-th-th"; - version = "experimental-2024-02-27"; + version = "experimental-2024-04-15"; dictFileName = "th_TH"; readmeFile = "README.md"; src = fetchFromGitHub { owner = "SyafiqHadzir"; repo = "Hunspell-TH"; - rev = "62d35f9211ca1eb4c367eac2ae57193efe6e88d2"; - sha256 = "sha256-t4m4u+qIgJPrKz58Cu2Q+knYm/+cvrNLzQsiiSRTB1A="; + rev = "419eb32115b936da9c949e35b35c29b8187f6c93"; + sha256 = "sha256-aXjof5dcEoCmep3PtvVkBhcgcd2NtqUpUEu37wsi1Uk="; }; meta = with lib; { description = "Hunspell dictionary for Central Thai (Thailand)"; diff --git a/nixpkgs/pkgs/development/libraries/hyena/default.nix b/nixpkgs/pkgs/development/libraries/hyena/default.nix index 177f6fe7909d..0a4e89b3b2de 100644 --- a/nixpkgs/pkgs/development/libraries/hyena/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyena/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { inherit monoDLLFixer; meta = with lib; { - homepage = "https://wiki.gnome.org/Attic/Hyena"; + homepage = "https://gitlab.gnome.org/Archive/hyena"; description = "A C# library which contains a hodge-podge of random stuff"; longDescription = '' Hyena is a C# library used to make awesome applications. It contains a lot of random things, diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index 55915b4bb523..5f0dbaec153c 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.10"; + version = "0.10.11"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-xFX48qAr0x0iNRns/aGH9UKL0wGJyfccQLdEXUFI/TU="; + hash = "sha256-RUxA9j2VDzwuYO/1HtyF3/ejGCJ7Gdjm7U8/Q8JxTbI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index 275d44e88dd9..ed15d6229d9e 100644 --- a/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.4"; + version = "1.90.5"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; + sha256 = "sha256-iTs8bcCAR8lvN1tcKmwyB3CcFmqR1QpqdGqdER920rM="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 6d21c7bc6e1a..5c647aaadfe6 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.18"; + version = "22.3.19"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-woEYEgvwf12aWCeYqSiosQAUJErGaEP3q8JER971lys="; + sha256 = "sha256-y35rcAo1CR8HvKD4hCtdMSSPSSnGaUf4l2Tdzbq5fFw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 68028849b639..6dec37315ab9 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "23.3.5"; + version = "24.2.1"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - hash = "sha256-7OdLpqO2evNeyxceOtHEI7sJCVybqvrcM1ZZx8bI4xw="; + hash = "sha256-75NNxcWQUx0Qs7TWZMxu1TMm22/wCsmQPZXKGKFHEh0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/jansson/default.nix b/nixpkgs/pkgs/development/libraries/jansson/default.nix index fbc9a676a85c..e86832420969 100644 --- a/nixpkgs/pkgs/development/libraries/jansson/default.nix +++ b/nixpkgs/pkgs/development/libraries/jansson/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 750a5aa8d002..1b2bd8a3e866 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -4,7 +4,7 @@ }: let - version = "6.0.1-3"; + version = "6.0.1-5"; in (ffmpeg_6-full.override { @@ -13,7 +13,7 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-UINiXO61nB/AL0HJJy7G7emujakk/mQv81aUioyJz0Y="; + hash = "sha256-y/J4iBbqtyyMnTb6R3lTVSOQD8oPo8liyVA5GQ5BvmM="; }; }).overrideAttrs (old: { pname = "jellyfin-ffmpeg"; diff --git a/nixpkgs/pkgs/development/libraries/jose/default.nix b/nixpkgs/pkgs/development/libraries/jose/default.nix index 656b014b733d..967886ae86c6 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 = "12"; + version = "13"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-MuYRgYskIT2rmd32gziCdiRwIWMKQ6iTx0Qm/jJI+Iw="; + hash = "sha256-XkYvBjPmwhwo2p8/jTXazHRAgSGkI7LTLUlqbxMxlys="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/latchset/jose"; maintainers = with lib.maintainers; [ ]; license = lib.licenses.asl20; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 79075929c651..1f36ccdc051d 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; - homepage = "https://wiki.gnome.org/Projects/JsonGlib"; + homepage = "https://gitlab.gnome.org/GNOME/json-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix b/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix index 9a96b92c1258..4af3a77a50e6 100644 --- a/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix +++ b/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix @@ -4,13 +4,13 @@ let isQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation rec { pname = "kcolorpicker"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ksnip"; repo = "kColorPicker"; rev = "v${version}"; - hash = "sha256-gkjlIiLB3/074EEFrQUa0djvVt/C44O3afqqNis64P0="; + hash = "sha256-FG/A4pDNuhGPOeJNZlsnX3paEy4ibJVWKxn8rVUGpN8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix b/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix index 29b7bf992775..a1020fe98679 100644 --- a/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix +++ b/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix @@ -1,24 +1,32 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , qtbase +, qtdeclarative +, qtquickcontrols2 , qtx11extras +, spdlog +, fmt +, nlohmann_json }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "1.7.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k5Hn9kxq1+tH5kV/ZeD4xzQLDgcY4ACC+guP7YJD4C8="; + sha256 = "sha256-V4BMD1kYyaMlqNBo8otpV5yBt/PICzhBTkEMX9N3lbk="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtx11extras ]; + buildInputs = [ spdlog fmt nlohmann_json ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtquickcontrols2 qtx11extras ]; + + dontWrapQtApps = true; meta = with lib; { description = "KDAB's Dock Widget Framework for Qt"; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 8815683aef65..522c27bf56eb 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,11 +1,11 @@ { - stdenv, lib, mkDerivation, fetchpatch, + stdenv, lib, mkDerivation, extra-cmake-modules, kdoctools, qttools, acl, attr, libkrb5, util-linux, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, - qtbase, qtscript, qtx11extras, solid, kcrash, kded + qtbase, qtscript, qtx11extras, solid, kcrash, kded, }: mkDerivation { @@ -29,7 +29,7 @@ mkDerivation { separateDebugInfo = true; patches = [ ./0001-Remove-impure-smbd-search-path.patch - ]; + ]; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; }; diff --git a/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix b/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix index e32247a488a3..e179cb0f6c52 100644 --- a/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix +++ b/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix @@ -4,13 +4,13 @@ let isQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation rec { pname = "kimageannotator"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ksnip"; repo = "kImageAnnotator"; rev = "v${version}"; - hash = "sha256-Dq9CM/D3nA7MaY9rfwqF/UAw/+1ptKLf3P8jhFdngKk="; + hash = "sha256-LFou8gTF/XDBLNQbA4uurYJHQl7yOTKe2OGklUsmPrg="; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/lasem/default.nix b/nixpkgs/pkgs/development/libraries/lasem/default.nix index 80a5fc0e24d0..c76a69556250 100644 --- a/nixpkgs/pkgs/development/libraries/lasem/default.nix +++ b/nixpkgs/pkgs/development/libraries/lasem/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "SVG and MathML rendering library"; mainProgram = "lasem-render-0.4"; - homepage = "https://wiki.gnome.org/Projects/Lasem"; + homepage = "https://github.com/LasemProject/lasem"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index de1af1f447e8..cdcf21edd799 100644 --- a/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -13,15 +13,16 @@ , cmocka , wafHook , libxcrypt +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldb"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - hash = "sha256-NY3KEPzScgeshXoNf0NaRtvGzR98ENu4QMGTG/GWXwg="; + url = "mirror://samba/ldb/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-EFqv9xrYgaf661gv1BauKCIbb94zj/+CgoBlBiwlB6U="; }; outputs = [ "out" "dev" ]; @@ -70,11 +71,16 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "lib" "modules" ]; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { broken = stdenv.isDarwin; description = "A LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; + pkgConfigModules = [ "ldb" ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 06b528ff8cf7..80038b79442a 100644 --- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.12"; + version = "1.12.13"; src = fetchFromGitHub { - sha256 = "sha256-V/AMdJ3ldlgBaO8gS0FOqb5tTdRGGW/+3LZq/TKkdog="; + sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/nixpkgs/pkgs/development/libraries/level-zero/default.nix index fb5c3ba283b6..a098a0ea5b6b 100644 --- a/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -1,23 +1,35 @@ { lib -, stdenv -, fetchFromGitHub , addOpenGLRunpath , cmake +, fetchFromGitHub +, fmt_9 +, spdlog +, stdenv +, substituteAll }: stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.16.1"; + version = "1.16.15"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-iPWEZ9aJ3uI4cAKRgur78zdVwGtD6q1TqwNpK+mg5hw="; + hash = "sha256-J+XIqaV1ThD0RqqcyIkzvTWCkIztjkHzGzUbj0qojJs="; }; + patches = [ + (substituteAll { + src = ./system-spdlog.diff; + spdlog = lib.getDev spdlog; + }) + ]; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ fmt_9 ]; + postFixup = '' addOpenGLRunpath $out/lib/libze_loader.so ''; diff --git a/nixpkgs/pkgs/development/libraries/level-zero/system-spdlog.diff b/nixpkgs/pkgs/development/libraries/level-zero/system-spdlog.diff new file mode 100644 index 000000000000..dee5432d0f7f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/level-zero/system-spdlog.diff @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e4af80..a54eecb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,9 @@ + # Copyright (C) 2020-2024 Intel Corporation + # SPDX-License-Identifier: MIT + ++add_compile_definitions(SPDLOG_FMT_EXTERNAL) ++add_compile_definitions(FMT_HEADER_ONLY) ++ + cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR) + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +@@ -58,7 +60,7 @@ elseif(Git_FOUND) + endif() + + include(FetchContent) +-set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src") ++set(SPDLOG_ROOT "@spdlog@") + + # Update other relevant variables to include the patch + set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") +diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt +index cb6cfb1..599338a 100644 +--- a/source/utils/CMakeLists.txt ++++ b/source/utils/CMakeLists.txt +@@ -1,16 +1,6 @@ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: MIT + +-include(FetchContent) +-set(SPDLOG_REPO https://github.com/gabime/spdlog) +-set(SPDLOG_TAG v1.13.0) +-FetchContent_Declare( +- spdlog +- GIT_REPOSITORY ${SPDLOG_REPO} +- GIT_TAG ${SPDLOG_TAG} +-) +-FetchContent_makeAvailable(spdlog) +- + add_library(utils + STATIC + "logging.h" +@@ -19,5 +9,5 @@ add_library(utils + + target_include_directories(utils + PUBLIC +- ${FETCHCONTENT_BASE_DIR}/spdlog-src/include ++ @spdlog@/include + ) +diff --git a/source/utils/logging.h b/source/utils/logging.h +index 4aad451..c8c4cc3 100644 +--- a/source/utils/logging.h ++++ b/source/utils/logging.h +@@ -16,8 +16,8 @@ + #include <string> + #include <vector> + +-#include "spdlog/sinks/basic_file_sink.h" +-#include "spdlog/spdlog.h" ++#include <spdlog/sinks/basic_file_sink.h> ++#include <spdlog/spdlog.h> + + namespace loader { + diff --git a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix index c540f4bc26ec..cfac6c97ac74 100644 --- a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, gitUpdater, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { pname = "libaccounts-glib"; - version = "1.26"; + version = "1.27"; outputs = [ "out" "dev" "devdoc" "py" ]; src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-glib"; - rev = version; - sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; + rev = "VERSION_${version}"; + sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; nativeBuildInputs = [ @@ -46,11 +46,17 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ + "-Dinstall-py-overrides=true" "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "VERSION_"; + }; + meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-glib"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index a808b62c3a3b..ffac6412ef95 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.8.1"; + version = "3.8.2"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-qng9fEbm71HqPnPzfgqswSium9egIgpB6ZLesOQVg6c="; + hash = "sha256-x152jIe7QxeprFEFJnXBfou8yHuW0oHImLIVkSxByWw="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index d58ba0bc5c5c..ac8ebcb3eb1c 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch"; hash = "sha256-RM3xFM6S2DkM5DJ0kAba8eLzEXuY5/7AaU06maHJ6rM="; }) + (fetchpatch { + name = "fix-suspicious-commit-from-known-bad-actor.patch"; + url = "https://github.com/libarchive/libarchive/commit/6110e9c82d8ba830c3440f36b990483ceaaea52c.patch"; + hash = "sha256-/j6rJ0xWhtXU0YCu1LOokxxNppy5Of6Q0XyO4U6la7M="; + }) ]; outputs = [ "out" "lib" "dev" ]; @@ -59,6 +64,10 @@ stdenv.mkDerivation (finalAttrs: { # access-time-related tests flakey on some systems "cpio/test/test_option_a.c" "cpio/test/test_option_t.c" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + # only on some aarch64-linux systems? + "cpio/test/test_basic.c" + "cpio/test/test_format_newc.c" ]; removeTest = testPath: '' substituteInPlace Makefile.am --replace "${testPath}" "" diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 7b317ecec5a5..8ec4b709b162 100644 --- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${finalAttrs.version}-1"; - hash = "sha256-9tPI8FyHQ9i7p4HLrxiseIH8Y5uqnlsNjcZ1qIHCcRY="; + hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index bc10d06b846c..552259ce3bab 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration -, withJava ? false, jdk, ant +, withJava ? false, jdk17, ant, stripJavaArchivesHook , withAACS ? false, libaacs , withBDplus ? false, libbdplus , withMetadata ? true, libxml2 @@ -19,23 +19,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ lib.optionals withJava [ ant ]; + ++ lib.optionals withJava [ jdk17 ant stripJavaArchivesHook ]; buildInputs = [ fontconfig ] - ++ lib.optional withJava jdk ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype ++ lib.optional stdenv.isDarwin DiskArbitration; propagatedBuildInputs = lib.optional withAACS libaacs; - NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; - preConfigure = lib.optionalString withJava '' - export JDK_HOME="${jdk.home}" - ''; - configureFlags = lib.optional (!withJava) "--disable-bdjava-jar" ++ lib.optional (!withMetadata) "--without-libxml2" ++ lib.optional (!withFonts) "--without-freetype"; diff --git a/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix index bd39cfb71cb3..b6fd599e0dfd 100644 --- a/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libcdio-paranoia"; - version = "0.94+2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rocky"; repo = "libcdio-paranoia"; rev = "release-10.2+${version}"; - sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha"; + hash = "sha256-kNGhhslp5noAVeho0kBVfyvb4kQpDY56nyL3a4aFgjE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libcec/default.nix b/nixpkgs/pkgs/development/libraries/libcec/default.nix index 90ffcb01cf91..78746cf01254 100644 --- a/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "http://libcec.pulse-eight.com"; license = lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.titanous ]; + maintainers = teams.kodi.members; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/nixpkgs/pkgs/development/libraries/libcec/platform.nix index d9594c90b624..ce109cab6dcf 100644 --- a/nixpkgs/pkgs/development/libraries/libcec/platform.nix +++ b/nixpkgs/pkgs/development/libraries/libcec/platform.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Pulse-Eight/platform"; license = lib.licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.titanous ]; + maintainers = teams.kodi.members; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index d6d098110af8..ce83c3c22cd4 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -73,7 +73,7 @@ let platforms."aarch64-linux".sha256 = "16sbfk599h96wcsmpbxlwsvq0n1pssmm8dpwmjsqfrn1464dvs68"; platforms."x86_64-linux".sha256 = "1wa4nv28saz96kar9svdarfz6c4rnbcqz0rqxzl9zclnhfzhqdiw"; - platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; + platformInfo = platforms.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { pname = "cef-binary"; diff --git a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index 065d412c91e1..f49d12e639db 100644 --- a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/libchamplain"; + homepage = "https://gitlab.gnome.org/GNOME/libchamplain"; license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; diff --git a/nixpkgs/pkgs/development/libraries/libchardet/default.nix b/nixpkgs/pkgs/development/libraries/libchardet/default.nix index a362e8ab2bb7..9152038e1681 100644 --- a/nixpkgs/pkgs/development/libraries/libchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchardet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { pname = "libchardet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs="; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook perl ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix index 5977ea33bd24..6161ea78174d 100644 --- a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; - sha256 = "uYdFbt2vcVup1iOqK8UBqxtpff/rEaqng6Y3J13xhto="; + sha256 = "O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix b/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix index c18e699eaf86..cd9e7778a80b 100644 --- a/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2024-02-05"; + version = "unstable-2024-04-15"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "bd4fa85d7f772f2ad32146d5681c91612fc93842"; - sha256 = "2F6MmLfKyFl7HzdTb1NDBVHMSRVzVhcib93JVaR58Qw="; + rev = "25541e312f7094e9c90895000d435af520d42418"; + sha256 = "d5uhtlO+28uc2Xnf5trXsy43jgmzBHs2jZhCK57qRM4="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index 9c090399dbc5..62fdba7ba66a 100644 --- a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-bBSsD845iwCMA7TdMBxzezjNbMaGwvRq6rvY/8NLYRU="; + hash = "sha256-hxXDovJAmuh15jFaxY9aESoTVVJ3u2twsX31U3txans="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index 38ba2e3b3615..1e7bb7d05e3a 100644 --- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { for those libraries. In other cases, our design isn't quite generic enough to work for everyone. ''; - homepage = "https://wiki.gnome.org/Apps/Builder"; + homepage = "https://gitlab.gnome.org/GNOME/libdazzle"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index 52bf3a272bab..c59ace0aa23e 100644 --- a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeflate"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; + sha256 = "sha256-kHLdu/Pb94+arj98Jjp57FpvWbAXW49s9cxCA1cf898="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock b/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock index 417a92d2d166..13d06de98ed4 100644 --- a/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock @@ -3,45 +3,43 @@ version = 3 [[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] name = "anes" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] -name = "anyhow" -version = "1.0.70" +name = "anstyle" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] -name = "atty" -version = "0.2.14" +name = "anyhow" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "bitstream-io" -version = "1.6.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "bitvec" @@ -57,18 +55,18 @@ dependencies = [ [[package]] name = "bitvec_helpers" -version = "3.1.2" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6883bd86b4112b56be19de3a1628de6c4063be7be6e641d484c83069efb4a" +checksum = "c810ea0801e8aabb86ded7f207b0d5a7f23c804cd1b7719aba2b4970899c099a" dependencies = [ "bitstream-io", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cast" @@ -84,9 +82,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -95,15 +93,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -111,55 +109,59 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "bitflags", - "clap_lex", - "indexmap", - "textwrap", + "clap_builder", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_builder" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ - "os_str_bytes", + "anstyle", + "clap_lex", ] [[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -182,51 +184,39 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "dolby_vision" -version = "3.1.2" +version = "3.3.0" dependencies = [ "anyhow", "bitvec", @@ -241,9 +231,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "funty" @@ -253,42 +249,45 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ - "libc", + "equivalent", + "hashbrown", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "is-terminal" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "autocfg", - "hashbrown", + "hermit-abi", + "libc", + "windows-sys", ] [[package]] @@ -302,73 +301,51 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] name = "libc" -version = "0.2.141" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "memoffset" -version = "0.8.0" +name = "memchr" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -377,16 +354,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -397,33 +368,33 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -436,9 +407,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -446,45 +417,54 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" -dependencies = [ - "xmlparser", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -496,36 +476,30 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] name = "serde" -version = "1.0.159" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap", "itoa", @@ -535,20 +509,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.13" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -562,12 +525,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -579,15 +536,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -595,9 +552,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -605,24 +562,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -630,63 +587,114 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "winapi-util" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-sys", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] [[package]] -name = "winapi-util" -version = "0.1.5" +name = "windows-targets" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "winapi", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "wyz" @@ -696,9 +704,3 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] - -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/nixpkgs/pkgs/development/libraries/libdovi/default.nix b/nixpkgs/pkgs/development/libraries/libdovi/default.nix index c70a217f6fce..38cf72b2acce 100644 --- a/nixpkgs/pkgs/development/libraries/libdovi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdovi/default.nix @@ -8,12 +8,12 @@ rustPlatform.buildRustPackage rec { pname = "libdovi"; - version = "3.1.2"; + version = "3.3.0"; src = fetchCrate { pname = "dolby_vision"; inherit version; - hash = "sha256-eLmGswgxtmqGc9f8l/9qvwSm+8bi06q+Ryvo7Oyr7s0="; + hash = "sha256-224fX+9klmWVoakU+XM7HrGa4iP4xsBJtn+686cH0qc="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix index 006933a4de03..b4bccdf30ef3 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix @@ -4,9 +4,9 @@ }: callPackage ./common.nix rec { - version = "0.9.0"; + version = "0.9.2"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - hash = "sha512-KC2Q38nacE62SkuhFB8q5mD+6xS78acjdzhmmOMSSSi0SmkU2OiOYUGrCINc5yOtCQqFOtV9vLQ527pXJV+1iQ=="; + hash = "sha512-9QK22kuW1ZYtoRl8SuUiv9soWElsSvGYEJ2ETgAhMYyypevJyM+fwuRDmZfKlUXGUMpPKPDZbLZrBcm4m5jy+A=="; buildInputs = [ zlib zstd ]; knownVulnerabilities = []; } diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix index 7be484538ab1..9e8d5970431c 100644 --- a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch2 +, fetchurl , autoreconfHook , strace , which @@ -24,6 +25,16 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM="; }) + + # Don't use transitional LFS64 API, removed in musl 1.2.4. + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/libeatmydata/lfs64.patch?id=f87f2c59384cc4a8a1b71aaa875be2b3ae2dbce0"; + hash = "sha256-5Jhy9gunKcbrSmLh0DoP/uwJLgaLd+zKV2iVxiDwiHs="; + }) + ]; + + configureFlags = [ + "CFLAGS=-D_FILE_OFFSET_BITS=64" ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libepc/default.nix b/nixpkgs/pkgs/development/libraries/libepc/default.nix index a2822eae8d54..c9a1d09172a9 100644 --- a/nixpkgs/pkgs/development/libraries/libepc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libepc/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Easy Publish and Consume Library"; - homepage = "https://wiki.gnome.org/Projects/libepc"; + homepage = "https://gitlab.gnome.org/Archive/libepc"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/nixpkgs/pkgs/development/libraries/libfabric/default.nix index ab92befa9ed8..26e2687575a0 100644 --- a/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.20.1"; + version = "1.21.0"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rQzsh3Q2xaGwmmsfvUmFE8WbAb1e2JEvunSoqZYRHvE="; + sha256 = "sha256-p0L9l1UpxD2WCZWXBNaEz9Zjzr5is3iEODcoQQa1f6M="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 7e90a05fb5b0..9024be0f259c 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.46.0"; + version = "0.47.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-OHr1xNSENIKl+/GD0B3ZYZtLha+g1olcXuyzpgEvrCE="; + hash = "sha256-YYpYa2E773EKYzxCv92mFmbLsPyKkq1JA2HQvJHFg0E="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix index 3f3c7f753c70..9dc2f368e2cd 100644 --- a/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "libfive"; - version = "0-unstable-2024-02-14"; + version = "0-unstable-2024-03-28"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "7af5f43684a8a497ac8610d39f7fca935364a9b9"; - hash = "sha256-GQzsHKeKsCWKOVfBrTuUFq2XasPxhsN+19stWY0WtVc="; + rev = "4c59b11667bbe8be9802f59697fa64bbfe1ea82d"; + hash = "sha256-scYSprozfC537vAXhMfWswyS3xivpoURWPhplH7yHIg="; }; nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index f594d64095c4..40e7ab53240e 100644 --- a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/pantoniou/libfyaml"; changelog = "https://github.com/pantoniou/libfyaml/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; pkgConfigModules = [ "libfyaml" ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix index e0d3a7318a85..3f7242aedd33 100644 --- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GData API library"; - homepage = "https://wiki.gnome.org/Projects/libgdata"; + homepage = "https://gitlab.gnome.org/GNOME/libgdata"; maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/libgee/default.nix b/nixpkgs/pkgs/development/libraries/libgee/default.nix index 7863235e0211..0ae1886ebb62 100644 --- a/nixpkgs/pkgs/development/libraries/libgee/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgee/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - homepage = "https://wiki.gnome.org/Projects/Libgee"; + homepage = "https://gitlab.gnome.org/GNOME/libgee"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index 9d16775f626b..26b0a9907d11 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A glib wrapper library around the libgit2 git access library"; - homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; + homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index acd8b374b58b..66fa722573fd 100644 --- a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.76"; + version = "1.0.77"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-qp3zcaoLM6G3DZgb2Jic1OhHetraEmYRiGkbQlSBnjs="; + sha256 = "sha256-SLpyQsRl7yfCAgK3udSSQo8OZOf6FRCzFKIDDUKg1gs="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix b/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix index 03166a423c3a..bc8da8045899 100644 --- a/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = "https://wiki.gnome.org/Apps/Games"; + homepage = "https://gitlab.gnome.org/GNOME/libgnome-games-support"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix index e63d7f8fe656..bdbdc10f514c 100644 --- a/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = "https://wiki.gnome.org/Apps/Games"; + homepage = "https://gitlab.gnome.org/GNOME/libgnome-games-support"; license = licenses.lgpl3; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix index f360e29ec2f2..f31f26539a55 100644 --- a/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; - homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; + homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; license = with lib.licenses; [ gpl2 lgpl2 ]; }; }) diff --git a/nixpkgs/pkgs/development/libraries/libgrss/default.nix b/nixpkgs/pkgs/development/libraries/libgrss/default.nix index 8cb978042e71..ce0c6e14edc2 100644 --- a/nixpkgs/pkgs/development/libraries/libgrss/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgrss/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; - homepage = "https://wiki.gnome.org/Projects/Libgrss"; + homepage = "https://gitlab.gnome.org/GNOME/libgrss"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 68e3e42476e7..99ca086792fb 100644 --- a/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A library that provides GObject bindings for libudev"; - homepage = "https://wiki.gnome.org/Projects/libgudev"; + homepage = "https://gitlab.gnome.org/GNOME/libgudev"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/nixpkgs/pkgs/development/libraries/libgweather/default.nix index 53c4b5f259b7..58fb14167bd3 100644 --- a/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to access weather information from online services for numerous locations"; - homepage = "https://wiki.gnome.org/Projects/LibGWeather"; + homepage = "https://gitlab.gnome.org/GNOME/libgweather"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/nixpkgs/pkgs/development/libraries/libgxps/default.nix index 397939103400..041431651c3e 100644 --- a/nixpkgs/pkgs/development/libraries/libgxps/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgxps/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject based library for handling and rendering XPS documents"; - homepage = "https://wiki.gnome.org/Projects/libgxps"; + homepage = "https://gitlab.gnome.org/GNOME/libgxps"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 28e698e2a83f..19dcb4248f9b 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.8.2"; + version = "1.8.3"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0RqizT5XCsbQ79ukbRcxR8EfRYJkV+kkwFmQuy4N+a0="; + sha256 = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix index 427ad20eca32..c35db9e46b43 100644 --- a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mainProgram = "hdhomerun_config"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ sielicki titanous ]; + maintainers = with maintainers; [ sielicki ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix index 0f7859be9dbb..bcc676b1b040 100644 --- a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,23 +1,18 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; + hash = "sha256-1QHfqRyOrREGlno9OCnyunOMP6wKZcs1jtKrOHDdxe8="; }; - patches = [ - (fetchurl { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/libhugetlbfs/glibc-2.34-fix.patch?rev=50"; - sha256 = "sha256-eRQa6M0ZdHMtwA5nnzDTWYv/x4AnRZhj+MpDiwyCvVM="; - }) - ]; - outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; + nativeBuildInputs = [ autoreconfHook ]; + postConfigure = '' patchShebangs ld.hugetlbfs ''; @@ -43,6 +38,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { + homepage = "https://github.com/libhugetlbfs/libhugetlbfs"; + changelog = "https://github.com/libhugetlbfs/libhugetlbfs/blob/${version}/NEWS"; description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix index 243c26af8e58..9cfe47fcb4d5 100644 --- a/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.17"; + version = "3.0.18"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-GqPCjI40kkqNv9zTnLdJgZVBxS4eZRHl+k/BN9vGnDo="; + sha256 = "sha256-32FNnCybXO67Vtg1LM6miJUaK+r0mlfjxgLQg1LD8Es="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix index 44f4b025e50e..ed162d115298 100644 --- a/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { + lib.optionalString enableDarwinABICompat '' for iconv_h_in in iconv.h.in iconv.h.build.in; do substituteInPlace "include/$iconv_h_in" \ - --replace "#define iconv libiconv" "" \ - --replace "#define iconv_close libiconv_close" "" \ - --replace "#define iconv_open libiconv_open" "" \ - --replace "#define iconv_open_into libiconv_open_into" "" \ - --replace "#define iconvctl libiconvctl" "" \ - --replace "#define iconvlist libiconvlist" "" + --replace-fail "#define iconv libiconv" "" \ + --replace-fail "#define iconv_close libiconv_close" "" \ + --replace-fail "#define iconv_open libiconv_open" "" \ + --replace-fail "#define iconv_open_into libiconv_open_into" "" \ + --replace-fail "#define iconvctl libiconvctl" "" \ + --replace-fail "#define iconvlist libiconvlist" "" done ''; diff --git a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 8d8acfd835d0..3473a7aa4e16 100644 --- a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ma9e marsam ]; + maintainers = with maintainers; [ ma9e ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libime/default.nix b/nixpkgs/pkgs/development/libraries/libime/default.nix index ff9301eb9caf..69a6a033fc09 100644 --- a/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -21,21 +21,21 @@ let url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI="; }; - dictVer = "20230412"; + dictVer = "20240416"; dict = fetchurl { - url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz"; - hash = "sha256-8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc="; + url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst"; + hash = "sha256-nCYsv6MGy0w7BVmRt+IrRT4PJn8gzrXZ2eX4++Ty02c="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-PhzJtAGmSkMeXMSe2uR/JKHKlZtL0e3tPDZVoRCvAis="; + hash = "sha256-I8zznZlMz1U2DAVYkvtF1thEYz/tIEbA682y7czK5ck="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix index 5c602a4ee9aa..f85c559593d1 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "libimobiledevice-glue"; - version = "1.0.0"; + version = "1.2.0"; outputs = [ "out" "dev" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-9TjIYz6w61JaJgOJtWteIDk9bO3NnXp/2ZJwdirFcYM="; + hash = "sha256-Rfs1i1Tt8uf3WfR+cDlF4L75nFHg9VypjMhHt0TgkyQ="; }; nativeBuildInputs = [ @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "Library with common code used by the libraries and tools around the libimobiledevice project"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index a229bb1fef08..9a97bb0a67a2 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libint/default.nix b/nixpkgs/pkgs/development/libraries/libint/default.nix index 046e9608819d..a6ad9498afa3 100644 --- a/nixpkgs/pkgs/development/libraries/libint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libint/default.nix @@ -109,7 +109,7 @@ assert (builtins.elem shellSet [ "standard" "orca" ]); let pname = "libint"; - version = "2.8.1"; + version = "2.9.0"; meta = with lib; { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; @@ -126,7 +126,7 @@ let owner = "evaleev"; repo = pname; rev = "v${version}"; - hash = "sha256-0QWOJUjK7Jq4KCk77vNIrBNKOzPcc/1+Ji13IN5xUKM="; + hash = "sha256-y+Mo8J/UWDrkkNEDAoostb/k6jrhYYeU0u9Incrd2cE="; }; # Replace hardcoded "/bin/rm" with normal "rm" @@ -139,7 +139,7 @@ let tests/eri/Makefile \ tests/hartree-fock/Makefile \ tests/unit/Makefile; do - substituteInPlace $f --replace "/bin/rm" "rm" + substituteInPlace $f --replace-warn "/bin/rm" "rm" done ''; @@ -211,7 +211,7 @@ let buildInputs = [ boost eigen ]; # Default is just "double", but SSE2 is available on all x86_64 CPUs. - # AVX support is advertised, but does not work in 2.6 (possibly in 2.7). + # AVX support is advertised, but does not work. # Fortran interface is incompatible with changing the LIBINT2_REALTYPE. cmakeFlags = [ "-DLIBINT2_SHGAUSS_ORDERING=${shGaussOrd}" diff --git a/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/nixpkgs/pkgs/development/libraries/libiscsi/default.nix index 826593b9d66c..1008037c60cc 100644 --- a/nixpkgs/pkgs/development/libraries/libiscsi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiscsi/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { pname = "libiscsi"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libiscsi"; rev = version; - sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; + sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas="; }; postPatch = '' substituteInPlace lib/socket.c \ - --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + --replace-fail "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" ''; nativeBuildInputs = [ autoreconfHook ]; - # This problem is gone on libiscsi master. - env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"); + env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) { + # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] + NIX_CFLAGS_COMPILE = "-Wno-error=format"; + }; meta = with lib; { description = "iscsi client library and utilities"; diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 10dcc29785bd..c91ae27f6805 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -8,15 +8,23 @@ , libjpeg , libpng , libwebp +, gdk-pixbuf , openexr_3 , pkg-config +, makeWrapper , zlib , asciidoc , graphviz , doxygen , python3 +, lcms2 +, enablePlugins ? stdenv.buildPlatform.canExecute stdenv.hostPlatform }: +let + loadersPath = "${gdk-pixbuf.binaryDir}/jxl-loaders.cache"; +in + stdenv.mkDerivation rec { pname = "libjxl"; version = "0.9.1"; @@ -37,6 +45,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + gdk-pixbuf + makeWrapper asciidoc doxygen python3 @@ -63,12 +73,14 @@ stdenv.mkDerivation rec { # conclusively in its README or otherwise; they can best be determined # by checking the CMake output for "Could NOT find". buildInputs = [ + lcms2 giflib gperftools # provides `libtcmalloc` gtest libjpeg libpng libwebp + gdk-pixbuf openexr_3 zlib ]; @@ -95,18 +107,31 @@ stdenv.mkDerivation rec { # TODO: Update this package to enable this (overridably via an option): # Viewer tools for evaluation. # "-DJPEGXL_ENABLE_VIEWERS=ON" - - # TODO: Update this package to enable this (overridably via an option): + ] ++ lib.optionals enablePlugins [ # Enable plugins, such as: # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files # * the `gimp` one, which allows GIMP to load jpeg-xl files - # "-DJPEGXL_ENABLE_PLUGINS=ON" + "-DJPEGXL_ENABLE_PLUGINS=ON" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DJPEGXL_STATIC=ON" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ "-DJPEGXL_FORCE_NEON=ON" ]; + postPatch = '' + substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \ + --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" + ''; + + postInstall = lib.optionalString enablePlugins '' + GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \ + GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ + gdk-pixbuf-query-loaders --update-cache + mkdir -p "$out/bin" + makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \ + --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}" + ''; + CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee"; # FIXME x86_64-darwin: diff --git a/nixpkgs/pkgs/development/libraries/libkqueue/default.nix b/nixpkgs/pkgs/development/libraries/libkqueue/default.nix index 5f96353d9d69..54b6b2beecac 100644 --- a/nixpkgs/pkgs/development/libraries/libkqueue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libkqueue/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mheily/libkqueue"; changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; license = licenses.bsd2; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libkrun/default.nix b/nixpkgs/pkgs/development/libraries/libkrun/default.nix index dbee4c9a3582..6a6632029927 100644 --- a/nixpkgs/pkgs/development/libraries/libkrun/default.nix +++ b/nixpkgs/pkgs/development/libraries/libkrun/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${version}"; - hash = "sha256-cP+Pxl/9QIsoGysXTBZJ86q57cIMA7TJenMWtcOI+Y4="; + hash = "sha256-rrNiqwx4aEOB3fTyv8xcZEDsNJX4NNPhp13W0qnl1O0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-qVyHC015QJEt6LZ8br3H0nucYKhYGBMtyB2IBaixTqk="; + hash = "sha256-6Zfy0LtxUDZzwlhul2fZpsI1c7GWntAMfsT6j+QefVs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libks/default.nix b/nixpkgs/pkgs/development/libraries/libks/default.nix index 0b1135f8522b..520c8568ebc1 100644 --- a/nixpkgs/pkgs/development/libraries/libks/default.nix +++ b/nixpkgs/pkgs/development/libraries/libks/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libks"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G2ZsTm7qyEhkys+3lcuq1VsKTz3RpfodDekecRRk++w="; + sha256 = "sha256-cSBtNOJfau+7wQ5iUs4hnqSMoo8XYN9opwPfox2ke+E="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/nixpkgs/pkgs/development/libraries/liblc3/default.nix index f2ec852d3bf0..bcefd8311fbf 100644 --- a/nixpkgs/pkgs/development/libraries/liblc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblc3/default.nix @@ -7,7 +7,7 @@ let name = "liblc3"; - version = "1.0.4"; + version = "1.1.0"; in stdenv.mkDerivation { pname = name; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-nQJgF/cWoCx5TkX4xOaLB9SzvhVXPY29bLh7UwPMWEE="; + sha256 = "sha256-pKd9wOrDjKhWX8vTsg6qkE71FQlsC7VM/uq0ss1vsAQ="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmcfp/default.nix b/nixpkgs/pkgs/development/libraries/libmcfp/default.nix index 7a76fabaa433..37d667ffee9a 100644 --- a/nixpkgs/pkgs/development/libraries/libmcfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmcfp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.2.4"; + version = "1.3.3"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Xz7M3TmUHGqiYZbFGSDxsVvg4VhgoVvr9TW03UxdFBw="; + hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix deleted file mode 100644 index ee81e63ba5e4..000000000000 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: - -stdenv.mkDerivation rec { - pname = "libmediainfo"; - version = "24.01"; - - src = fetchurl { - url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-oC38Zon0hc7Ab6EqNBTDw6ooU7Td4YrqtLVKVsgxYlk="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ zlib ]; - propagatedBuildInputs = [ libzen ]; - - sourceRoot = "MediaInfoLib/Project/GNU/Library"; - - postPatch = lib.optionalString (stdenv.cc.targetPrefix != "") '' - substituteInPlace configure.ac \ - --replace "pkg-config " "${stdenv.cc.targetPrefix}pkg-config " - ''; - - configureFlags = [ "--enable-shared" ]; - - enableParallelBuilding = true; - - postInstall = '' - install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" - ''; - - meta = with lib; { - description = "Shared library for mediainfo"; - homepage = "https://mediaarea.net/"; - changelog = "https://mediaarea.net/MediaInfo/ChangeLog"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.devhell ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.69.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.69.nix deleted file mode 100644 index 866658c224f3..000000000000 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.69.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl }: - -callPackage ./generic.nix ( rec { - version = "0.9.69"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; - sha256 = "sha256-+5trFIt4dJPmN9MINYhxHmXLy3JvoCzuLNVDxd4n434="; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix deleted file mode 100644 index 7e60f8c72726..000000000000 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.71.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl }: - -callPackage ./generic.nix ( rec { - version = "0.9.71"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; - sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix deleted file mode 100644 index 4c695218184c..000000000000 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.72.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl }: - -callPackage ./generic.nix ( rec { - version = "0.9.72"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; - sha256 = "sha256-Cugl+ODX9BIB/USg3xz0VMHLC8UP6dWcJlUiYCZML/g="; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.74.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.74.nix deleted file mode 100644 index c4b3343ecd4c..000000000000 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.74.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl }: - -callPackage ./generic.nix ( rec { - version = "0.9.74"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; - sha256 = "sha256-QgNdAmE3MyS/tDQBj0q4klFLECU9GvIy5BtMwsEeZQs="; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix index d5bc619e9042..0af066c71238 100644 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {}, fetchpatch }: +{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }: let meta_ = meta; @@ -8,17 +8,6 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; inherit version src; - patches = lib.optionals (lib.versionOlder version "0.9.76") [ - (fetchpatch { - name = "CVE-2023-27371.patch"; - url = "https://git.gnunet.org/libmicrohttpd.git/patch/?id=e0754d1638c602382384f1eface30854b1defeec"; - hash = "sha256-vzrq9HPysGpc13rFEk6zLPgpUqp/ST4q/Wp30Dam97k="; - excludes = [ - "ChangeLog" - ]; - }) - ]; - outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; diff --git a/nixpkgs/pkgs/development/libraries/libmspack/default.nix b/nixpkgs/pkgs/development/libraries/libmspack/default.nix index a26f0c3f3a48..d03cdd635cd1 100644 --- a/nixpkgs/pkgs/development/libraries/libmspack/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmspack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmspack"; - version = "0.10.1alpha"; + version = "0.11alpha"; src = fetchurl { url = "https://www.cabextract.org.uk/libmspack/${pname}-${version}.tar.gz"; - sha256 = "13janaqsvm7aqc4agjgd4819pbgqv50j88bh5kci1z70wvg65j5s"; + hash = "sha256-cN0fsvCuzDZ5G3Gh4YQOYhcweeraoIEZLRwyOg7uohs="; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libnabo/default.nix b/nixpkgs/pkgs/development/libraries/libnabo/default.nix index c6268ea3ee7e..90ed45178d1f 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.1.0"; + version = "1.1.1"; pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; repo = "libnabo"; rev = version; - sha256 = "sha256-KWqNJWdyFFe5zAs1HzGnIshGXkBAKjnbEmBZXxty99E="; + sha256 = "sha256-EVbvNwj1aRhRr5PhF6Kkb/UTn4JzF174WX1C+tvBv2Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix index 35aff3d5deef..5d641a386344 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.8.0"; + version = "3.8.2"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-fIm5RBX6m0zSeq2WvpIEi2+ibpnyqsFkeP0T9NS+sOw="; + sha256 = "sha256-Tn88RRigL6C36AcFhUlLbLyqcqbBR8z6PKAQH4w/mYY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libnice/default.nix b/nixpkgs/pkgs/development/libraries/libnice/default.nix index ade70284ba68..72419deaccb5 100644 --- a/nixpkgs/pkgs/development/libraries/libnice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnice/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "libnice"; - version = "0.1.21"; + version = "0.1.22"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-cuc6Ks8g9ZCT4h1WAWBuQFhzUD6zXzRvpiHeI+mbOzk="; + hash = "sha256-pfckzwnq5QxBp1FxQdidpKYeyerKMtpKAHP67VQXrX4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/liboqs/default.nix b/nixpkgs/pkgs/development/libraries/liboqs/default.nix index 4962f9459d79..e703dc3647fa 100644 --- a/nixpkgs/pkgs/development/libraries/liboqs/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboqs/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, enableStatic ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, + enableStatic ? stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { @@ -35,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://openquantumsafe.org"; license = licenses.mit; platforms = platforms.all; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix index 46c05e6960a0..7bf8386f252f 100644 --- a/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Zscheile Lowlevel (utility) library"; homepage = "https://github.com/fogti/libowlevelzs"; license = licenses.mit; - maintainers = [ maintainers.fogti ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix b/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix index 38e4fe055085..61fe424e2c22 100644 --- a/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject-based plugins engine"; - homepage = "https://wiki.gnome.org/Projects/Libpeas"; + homepage = "https://gitlab.gnome.org/GNOME/libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/nixpkgs/pkgs/development/libraries/libpeas/default.nix index f9d8be93c66c..922bfba9ad23 100644 --- a/nixpkgs/pkgs/development/libraries/libpeas/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject-based plugins engine"; mainProgram = "peas-demo"; - homepage = "https://wiki.gnome.org/Projects/Libpeas"; + homepage = "https://gitlab.gnome.org/GNOME/libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index ad7043e064e3..46920c977cbc 100644 --- a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pganalyze/libpg_query/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix index afd28996265c..8e38347c722e 100644 --- a/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libplist"; - version = "2.3.0"; + version = "2.4.0"; outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-fZfDSWVRg73dN+WF6LbgRSj8vtyeKeyjC8pWXFxUmBg="; + hash = "sha256-bH40HSp76w56tlxO5M1INAW4wRR7O27AY4H/CyEcp+Y="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "A library to handle Apple Property List format in binary or XML"; homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "plistutil"; }; diff --git a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix index 01c3e3e87e43..92e158537347 100644 --- a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix @@ -1,33 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo, yaml-cpp }: stdenv.mkDerivation rec { pname = "libpointmatcher"; - version = "1.3.1"; + version = "1.4.2"; src = fetchFromGitHub { - owner = "ethz-asl"; - repo = pname; + owner = "norlab-ulaval"; + repo = "libpointmatcher"; rev = version; - sha256 = "0lai6sr3a9dj1j4pgjjyp7mx10wixy5wpvbka8nsc2danj6xhdyd"; + hash = "sha256-XXkvBxG9f8rW1O968+2R+gltMSRGqH225vOmzp6Tpb8="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen boost libnabo ]; + buildInputs = [ eigen boost libnabo yaml-cpp ]; cmakeFlags = [ - "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" + (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3") + (lib.cmakeBool "BUILD_TESTS" doCheck) ]; doCheck = true; - checkPhase = '' - ./utest/utest --path ../examples/data/ - ''; meta = with lib; { inherit (src.meta) homepage; description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ cryptix ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 076e4c33b964..340cfafee327 100644 --- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -1,83 +1,131 @@ { lib -, stdenv +, _experimental-update-script-combinators +, curl +, darwin +, duktape , fetchFromGitHub , fetchpatch -, pkg-config -, cmake -, zlib -, dbus -, networkmanager -, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform duktape -, duktape -, pcre -, gsettings-desktop-schemas +, gi-docgen +, gitUpdater , glib -, makeWrapper -, python3 -, SystemConfiguration -, CoreFoundation -, JavaScriptCore +, gobject-introspection +, gsettings-desktop-schemas +, makeHardcodeGsettingsPatch +, meson +, ninja +, pkg-config +, stdenv +, substituteAll +, vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; - version = "0.4.18"; + version = "0.5.3"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; - rev = version; - hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ="; + rev = finalAttrs.version; + hash = "sha256-qdYB6HJkgboS8kkTvTqLy6Z3JYY5SOJsRl6nZM0iuvw="; }; - patches = lib.optionals stdenv.isDarwin [ - # https://github.com/libproxy/libproxy/pull/189 + patches = [ + # Minor refactoring. Allows the following patches to apply without rebasing. (fetchpatch { - url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch"; - sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA="; + url = "https://github.com/libproxy/libproxy/commit/397f4dc72607cc1bb3b584ffd3de49f8ba80491a.patch"; + hash = "sha256-iUMBMpcVOLG+NxEj8Nd7JtKZFmoGXn0t6A2r2ayiteg="; + includes = [ + "src/backend/plugins/config-gnome/config-gnome.c" + ]; + }) + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # Disable schema presence detection, it would fail because it cannot be autopatched, + # and it will be hardcoded by the next patch anyway. + ./skip-gsettings-detection.patch + + # Hardcode path to Settings schemas for GNOME & related desktops. + # Otherwise every app using libproxy would need to be wrapped individually. + (substituteAll { + src = ./hardcode-gsettings.patch; + gds = glib.getSchemaPath gsettings-desktop-schemas; }) ]; - outputs = [ "out" "dev" "py3" ]; + postPatch = '' + # Fix running script that will try to install git hooks. + # Though it will not do anything since we do not keep .git/ directory. + # https://github.com/libproxy/libproxy/issues/262 + chmod +x data/install-git-hook.sh + patchShebangs data/install-git-hook.sh + + # Fix include-path propagation in non-static builds. + # https://github.com/libproxy/libproxy/pull/239#issuecomment-2056620246 + substituteInPlace src/libproxy/meson.build \ + --replace-fail "requires_private: 'gobject-2.0'" "requires: 'gobject-2.0'" + ''; nativeBuildInputs = [ + gi-docgen + gobject-introspection + meson + ninja pkg-config - cmake - makeWrapper + vala ]; buildInputs = [ - pcre - python3 - zlib - ] ++ lib.optionals enableJavaScript [ - (if stdenv.hostPlatform.isDarwin then JavaScriptCore else duktape) - ] ++ (if stdenv.hostPlatform.isDarwin then [ - SystemConfiguration - CoreFoundation - ] else [ + curl + duktape + ] ++ (if stdenv.hostPlatform.isDarwin then (with darwin.apple_sdk.frameworks; [ + Foundation + ]) else [ glib - dbus - networkmanager + gsettings-desktop-schemas ]); - cmakeFlags = [ - "-DWITH_PYTHON2=OFF" - "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" - ] ++ lib.optional (enableJavaScript && !stdenv.hostPlatform.isDarwin) "-DWITH_MOZJS=ON"; + mesonFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "-Dconfig-gnome=false" + ]; - postFixup = lib.optionalString stdenv.isLinux '' - # config_gnome3 uses the helper to find GNOME proxy settings - wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" + doCheck = !stdenv.hostPlatform.isDarwin; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; - doCheck = false; # fails 1 out of 10 tests + passthru = { + hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { + schemaIdToVariableMapping = { + "org.gnome.system.proxy" = "gds"; + "org.gnome.system.proxy.http" = "gds"; + "org.gnome.system.proxy.https" = "gds"; + "org.gnome.system.proxy.ftp" = "gds"; + "org.gnome.system.proxy.socks" = "gds"; + }; + inherit (finalAttrs) src; + }; + + updateScript = + let + updateSource = gitUpdater { }; + updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "libproxy.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + _experimental-update-script-combinators.sequence [ + updateSource + updatePatch + ]; + }; meta = with lib; { - platforms = platforms.linux ++ platforms.darwin; - license = licenses.lgpl21; - homepage = "https://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; + homepage = "https://libproxy.github.io/libproxy/"; + license = licenses.lgpl21Plus; + platforms = platforms.linux ++ platforms.darwin; mainProgram = "proxy"; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libproxy/hardcode-gsettings.patch b/nixpkgs/pkgs/development/libraries/libproxy/hardcode-gsettings.patch new file mode 100644 index 000000000000..22aeb5836f9c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libproxy/hardcode-gsettings.patch @@ -0,0 +1,140 @@ +diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c +index 820827b..338e269 100644 +--- a/src/backend/plugins/config-gnome/config-gnome.c ++++ b/src/backend/plugins/config-gnome/config-gnome.c +@@ -85,11 +85,60 @@ px_config_gnome_init (PxConfigGnome *self) + if (!self->available) + return; + +- self->proxy_settings = g_settings_new ("org.gnome.system.proxy"); +- self->http_proxy_settings = g_settings_new ("org.gnome.system.proxy.http"); +- self->https_proxy_settings = g_settings_new ("org.gnome.system.proxy.https"); +- self->ftp_proxy_settings = g_settings_new ("org.gnome.system.proxy.ftp"); +- self->socks_proxy_settings = g_settings_new ("org.gnome.system.proxy.socks"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy", FALSE); ++ self->proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.http", ++ FALSE); ++ self->http_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.https", ++ FALSE); ++ self->https_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.ftp", ++ FALSE); ++ self->ftp_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.socks", ++ FALSE); ++ self->socks_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } + } + + static void +diff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.c +index f80914a..118d429 100644 +--- a/tests/config-gnome-test.c ++++ b/tests/config-gnome-test.c +@@ -60,11 +60,60 @@ static void + fixture_setup (Fixture *self, + gconstpointer data) + { +- self->proxy_settings = g_settings_new ("org.gnome.system.proxy"); +- self->http_proxy_settings = g_settings_new ("org.gnome.system.proxy.http"); +- self->https_proxy_settings = g_settings_new ("org.gnome.system.proxy.https"); +- self->ftp_proxy_settings = g_settings_new ("org.gnome.system.proxy.ftp"); +- self->socks_proxy_settings = g_settings_new ("org.gnome.system.proxy.socks"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy", FALSE); ++ self->proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.http", ++ FALSE); ++ self->http_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.https", ++ FALSE); ++ self->https_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.ftp", ++ FALSE); ++ self->ftp_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@gds@", ++ g_settings_schema_source_get_default(), ++ TRUE, NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy.socks", ++ FALSE); ++ self->socks_proxy_settings = g_settings_new_full(schema, NULL, NULL); ++ } + } + + static void diff --git a/nixpkgs/pkgs/development/libraries/libproxy/skip-gsettings-detection.patch b/nixpkgs/pkgs/development/libraries/libproxy/skip-gsettings-detection.patch new file mode 100644 index 000000000000..1882079b94b0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libproxy/skip-gsettings-detection.patch @@ -0,0 +1,29 @@ +diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c +index 52e812e..a1edcab 100644 +--- a/src/backend/plugins/config-gnome/config-gnome.c ++++ b/src/backend/plugins/config-gnome/config-gnome.c +@@ -57,7 +57,6 @@ enum { + static void + px_config_gnome_init (PxConfigGnome *self) + { +- GSettingsSchemaSource *source; + g_autoptr (GSettingsSchema) proxy_schema = NULL; + const char *desktops; + +@@ -71,15 +70,7 @@ px_config_gnome_init (PxConfigGnome *self) + if (strstr (desktops, "GNOME") == NULL) + return; + +- source = g_settings_schema_source_get_default (); +- if (!source) { +- g_warning ("GNOME desktop detected but no schemes installed, aborting."); +- return; +- } +- +- proxy_schema = g_settings_schema_source_lookup (source, "org.gnome.system.proxy", TRUE); +- +- self->available = proxy_schema != NULL; ++ self->available = TRUE; + if (!self->available) + return; + diff --git a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix index d87ef2b72802..2dabe89bc50b 100644 --- a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix @@ -1,10 +1,7 @@ { lib -, clang-tools -, llvmPackages -, boost179 -, protobuf -, python3Support ? false -, python3 +, asioSupport ? true +, asio +, boost180 , log4cxxSupport ? false , log4cxx , snappySupport ? false @@ -17,7 +14,8 @@ , gtestSupport ? false , cmake , curl -, fetchurl +, fetchFromGitHub +, protobuf , jsoncpp , openssl , pkg-config @@ -37,48 +35,39 @@ let */ enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; - # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails - clangTools = clang-tools.override { inherit stdenv llvmPackages; }; - # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper - boost = if python3Support then boost179.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost179; - defaultOptionals = [ boost protobuf ] - ++ lib.optional python3Support python3 + defaultOptionals = [ protobuf ] ++ lib.optional snappySupport snappy.dev ++ lib.optional zlibSupport zlib ++ lib.optional zstdSupport zstd - ++ lib.optional log4cxxSupport log4cxx; + ++ lib.optional log4cxxSupport log4cxx + ++ lib.optional asioSupport asio + ++ lib.optional (!asioSupport) boost180; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "libpulsar"; - version = "2.10.2"; + version = "3.5.1"; - src = fetchurl { - hash = "sha256-IONnsSDbnX2qz+Xya0taHYSViTOiRI36AfcxmY3dNpo="; - url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; + src = fetchFromGitHub { + owner = "apache"; + repo = "pulsar-client-cpp"; + rev = "v${version}"; + hash = "sha256-BSDkF0MAc54N59t7ozMLof0of4sURL3qiksLZhb+6I8="; }; - sourceRoot = "apache-pulsar-${version}-src/pulsar-client-cpp"; - - # clang-tools needed for clang-format - nativeBuildInputs = [ cmake pkg-config clangTools ] + nativeBuildInputs = [ cmake pkg-config ] ++ defaultOptionals ++ lib.optional gtestSupport gtest.dev; buildInputs = [ jsoncpp openssl curl ] ++ defaultOptionals; - # Needed for GCC on Linux - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=return-type" ]; - cmakeFlags = [ "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" - "-DBUILD_PYTHON_WRAPPER=${enableCmakeFeature python3Support}" "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" - "-DClangTools_PATH=${clangTools}/bin" + "-DUSE_ASIO=${enableCmakeFeature asioSupport}" ]; - enableParallelBuilding = true; doInstallCheck = true; installCheckPhase = '' echo ${lib.escapeShellArg '' @@ -92,11 +81,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://pulsar.apache.org/docs/en/client-libraries-cpp"; + homepage = "https://pulsar.apache.org/docs/next/client-libraries-cpp/"; description = "Apache Pulsar C++ library"; - + changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${version}"; platforms = platforms.all; license = licenses.asl20; - maintainers = [ maintainers.corbanr ]; + maintainers = with maintainers; [ corbanr gaelreyrol ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libqb/default.nix b/nixpkgs/pkgs/development/libraries/libqb/default.nix index 8e798e4a38a4..fe54cdf3d338 100644 --- a/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { pname = "libqb"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8="; }; + patches = [ + # add a declaration of fdatasync, missing on darwin https://github.com/ClusterLabs/libqb/pull/496 + (fetchpatch { + url = "https://github.com/ClusterLabs/libqb/commit/255ccb70ee19cc0c82dd13e4fd5838ca5427795f.patch"; + hash = "sha256-6x4B3FM0XSRIeAly8JtMOGOdyunTcbaDzUeBZInXR4U="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 ]; diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index b461a3c07864..e388f2fbacb6 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -4,7 +4,7 @@ let isQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.8.1.2"; + version = "0.8.2"; outputs = [ "out" "dev" ]; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; + hash = "sha256-6sR/80r9qW9kMYqIi2FeXgb6M795XKzpvyE6eTaBsjA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index fe35759da63a..cb69770f054a 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 ) postInstall = '' substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \ - --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" + --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include" '' + lib.optionalString enablePython '' cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 ''; diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index eda75bf0b25f..59bcae1cd87a 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -111,15 +111,12 @@ in { }; libressl_3_8 = generic { - version = "3.8.3"; - hash = "sha256-pl9A4+9uPJRRyDGObyxFTDZ+Z/CcDN4YSXMaTW7McnI="; - - patches = [ - (fetchpatch { - name = "libtls-pkg-config-static.patch"; - url = "https://github.com/libressl/portable/commit/f7a0f40d52b994d0bca0eacd88b39f71e447c5d9.patch"; - hash = "sha256-2ly6lsIdoV/riVqDViFXDP7nkZ/RUatEdiaSudQKtz0="; - }) - ]; + version = "3.8.4"; + hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0="; + }; + + libressl_3_9 = generic { + version = "3.9.1"; + hash = "sha256-baC5VGlffuYrA/ZCAKik8Cr5Nxe2DM4Eq2yN8mLAelE="; }; } diff --git a/nixpkgs/pkgs/development/libraries/librest/1.0.nix b/nixpkgs/pkgs/development/libraries/librest/1.0.nix index 1e134f62bad7..eff390cb2031 100644 --- a/nixpkgs/pkgs/development/libraries/librest/1.0.nix +++ b/nixpkgs/pkgs/development/libraries/librest/1.0.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Helper library for RESTful services"; - homepage = "https://wiki.gnome.org/Projects/Librest"; + homepage = "https://gitlab.gnome.org/GNOME/librest"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/librest/default.nix b/nixpkgs/pkgs/development/libraries/librest/default.nix index 19f7ced5986f..de0ff52f1e1b 100644 --- a/nixpkgs/pkgs/development/libraries/librest/default.nix +++ b/nixpkgs/pkgs/development/libraries/librest/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Helper library for RESTful services"; - homepage = "https://wiki.gnome.org/Projects/Librest"; + homepage = "https://gitlab.gnome.org/GNOME/librest"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix index 95d88384b79e..4a95915d4205 100644 --- a/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.10.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-tflWBfH1+1AFvkq0A6mgsKl+jq6m5c83GA56LWxdnlw="; + sha256 = "sha256-QHuzpitxSYQ4EcBPY1f0R5zl4UFtefu0bFXA76Iv+j0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 415f097f3318..ee840b8e7f39 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.57.1"; + version = "2.58.0"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-B0Zxo+1vvNZ8ripA5TkQf08JfKikqxqJTAXiUk/zQO8="; + hash = "sha256-18REqSZAa1l5C+DerhluGO0mBZ2lc/oaqeycp2WKVZw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-zICI7sps5KYe8/yWXbCJv529KxGLjoyDOmpCgVAIsTs="; + hash = "sha256-ta+3KkDtqTLGoKknUn89c+3XHzvcZyPFPFpgLH5f5uw="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; @@ -217,7 +217,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A small library to render SVG images to Cairo surfaces"; - homepage = "https://wiki.gnome.org/Projects/LibRsvg"; + homepage = "hhttps://gitlab.gnome.org/GNOME/librsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; mainProgram = "rsvg-convert"; diff --git a/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix index 198bc7362826..bebe6c591ba4 100644 --- a/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "libsamplerate"; - version = "0.1.9"; + version = "0.2.2"; src = fetchurl { - url = "http://www.mega-nerd.com/SRC/${pname}-${version}.tar.gz"; - sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha"; + url = "https://github.com/libsndfile/libsamplerate/releases/download/${version}/libsamplerate-${version}.tar.xz"; + hash = "sha256-MljaKAUR0ktJ1rCGFbvoJNDKzJhCsOTK8RxSzysEOJM="; }; nativeBuildInputs = [ pkg-config ]; @@ -18,20 +18,17 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-fftw" ]; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "dev" "out" ]; postConfigure = optionalString stdenv.isDarwin '' # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers" - - substituteInPlace examples/Makefile --replace "-fpascal-strings" "" ''; meta = with lib; { description = "Sample Rate Converter for audio"; - mainProgram = "sndfile-resample"; - homepage = "http://www.mega-nerd.com/SRC/index.html"; + homepage = "https://libsndfile.github.io/libsamplerate/"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 514b8c05177b..040722ea406e 100644 --- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for storing and retrieving passwords and other secrets"; - homepage = "https://wiki.gnome.org/Projects/Libsecret"; + homepage = "https://gitlab.gnome.org/GNOME/libsecret"; license = lib.licenses.lgpl21Plus; mainProgram = "secret-tool"; inherit (glib.meta) platforms maintainers; diff --git a/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/nixpkgs/pkgs/development/libraries/libserdes/default.nix index ac776c4e4231..cc66f4cc1308 100644 --- a/nixpkgs/pkgs/development/libraries/libserdes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libserdes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libserdes"; - version = "7.6.0"; + version = "7.6.1"; src = fetchFromGitHub { owner = "confluentinc"; diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index ba1b003442ff..01062398246b 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8="; + hash = "sha256-f0c9rZ5QA4A7zKdXz6ImyPU0TnYi41cmjoqDqF9zYdA="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 6af948f67828..60e7da290726 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -13,6 +13,7 @@ , withRpm ? !stdenv.isDarwin , rpm , db +, withConda ? true }: stdenv.mkDerivation rec { @@ -23,11 +24,12 @@ stdenv.mkDerivation rec { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-cL7SDwCzXM2qJQfiu/3nfAiFbcFNn1YXD23Sl3n9nzY="; + hash = "sha256-cL7SDwCzXM2qJQfiu/3nfAiFbcFNn1YXD23Sl3n9nzY="; }; cmakeFlags = [ "-DENABLE_COMPLEX_DEPS=true" + (lib.cmakeBool "ENABLE_CONDA" withConda) "-DENABLE_LZMA_COMPRESSION=true" "-DENABLE_BZIP2_COMPRESSION=true" "-DENABLE_ZSTD_COMPRESSION=true" diff --git a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 6d1545af4079..4d5f30cf0b6e 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; - homepage = "https://wiki.gnome.org/Projects/libsoup"; + homepage = "https://gitlab.gnome.org/GNOME/libsoup"; license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 11e1a5a40f1e..e92c59bc2f2c 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; - homepage = "https://wiki.gnome.org/Projects/libsoup"; + homepage = "https://gitlab.gnome.org/GNOME/libsoup"; license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; pkgConfigModules = [ diff --git a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix deleted file mode 100644 index 880d468cae05..000000000000 --- a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, libtool -, openssl -, expat -, pkg-config -, check -}: - -stdenv.mkDerivation rec { - pname = "libstrophe"; - version = "0.12.3"; - - src = fetchFromGitHub { - owner = "strophe"; - repo = pname; - rev = version; - sha256 = "EDgdKJ7wqUoThy0t1r39p2lbn64uvTDoIqNCzhpWnZ8="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ openssl expat libtool check ]; - - dontDisableStatic = true; - - doCheck = true; - - meta = with lib; { - description = "A simple, lightweight C library for writing XMPP clients"; - longDescription = '' - libstrophe is a lightweight XMPP client library written in C. It has - minimal dependencies and is configurable for various environments. It - runs well on both Linux, Unix, and Windows based platforms. - ''; - homepage = "https://strophe.im/libstrophe/"; - license = with licenses; [ gpl3Only mit ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - maintainers = with maintainers; [ devhell flosse ]; - }; -} - diff --git a/nixpkgs/pkgs/development/libraries/libsv/default.nix b/nixpkgs/pkgs/development/libraries/libsv/default.nix index 9c6279937560..4136c6471407 100644 --- a/nixpkgs/pkgs/development/libraries/libsv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsv/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "libsv"; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { description = "Public domain cross-platform semantic versioning in C99"; homepage = "https://github.com/uael/sv"; license = licenses.unlicense; - maintainers = []; + maintainers = [ lib.maintainers.sigmanificient ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix b/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix deleted file mode 100644 index 3b24c6f1a2e1..000000000000 --- a/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch - -, autoreconfHook -, pkg-config -, sphinx - -, libdeflate -, libjpeg -, xz -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libtiff"; - version = "4.5.1"; - - src = fetchFromGitLab { - owner = "libtiff"; - repo = "libtiff"; - rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; - }; - - patches = [ - # cf. https://bugzilla.redhat.com/2224974 - (fetchpatch { - name = "CVE-2023-40745.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/bdf7b2621c62e04d0408391b7d5611502a752cd0.diff"; - hash = "sha256-HdU02YJ1/T3dnCT+yG03tUyAHkgeQt1yjZx/auCQxyw="; - }) - # cf. https://bugzilla.redhat.com/2224971 - (fetchpatch { - name = "CVE-2023-41175.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/965fa243004e012adc533ae8e38db3055f101a7f.diff"; - hash = "sha256-Pvg6JfJWOIaTrfFF0YSREZkS9saTG9IsXnsXtcyKILA="; - }) - # FreeImage needs this patch - ./headers-4.5.patch - # libc++abi 11 has an `#include <version>`, this picks up files name - # `version` in the project's include paths - ./rename-version-4.5.patch - ]; - - postPatch = '' - mv VERSION VERSION.txt - ''; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - # If you want to change to a different build system, please make - # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; - - propagatedBuildInputs = [ - libdeflate - libjpeg - xz - zlib - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format"; - homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; - # XXX not enabled for now to keep hydra builds running, - # but we have to keep an eye on security updates in supported version - #knownVulnerabilities = [ "support for version 4.5 ended in Sept 2023" ]; - maintainers = with maintainers; [ yarny ]; - license = licenses.libtiff; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 80b5f411e663..c8871a4ba68e 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -7,6 +7,7 @@ , pkg-config , sphinx +, lerc , libdeflate , libjpeg , xz @@ -27,9 +28,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtiff"; version = "4.6.0"; - # if you update this, please consider adding patches and/or - # setting `knownVulnerabilities` in libtiff `4.5.nix` - src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; @@ -62,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { # sure cross-compilation works first! nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + buildInputs = [ + lerc + ]; + # TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ libdeflate @@ -88,9 +90,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${finalAttrs.version}.html"; + changelog = "https://libtiff.gitlab.io/libtiff/releases/v${finalAttrs.version}.html"; license = licenses.libtiff; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libtiff-4" ]; + maintainers = teams.geospatial.members; }; }) diff --git a/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch b/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch deleted file mode 100644 index 49af1abb0a54..000000000000 --- a/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch +++ /dev/null @@ -1,16 +0,0 @@ -export private headers for freeimage ---- i/libtiff/Makefile.am -+++ w/libtiff/Makefile.am -@@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in - - libtiffinclude_HEADERS = \ -+ tif_config.h \ -+ tif_dir.h \ -+ tif_hash_set.h \ - tiff.h \ - tiffio.h \ -+ tiffiop.h \ - tiffvers.h - - if HAVE_CXX diff --git a/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix b/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix new file mode 100644 index 000000000000..37e48f6ea14f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchzip + +, autoreconfHook +, pkg-config +, sphinx + +, libdeflate +, libjpeg +, xz +, zlib +}: + +# This is a fork created by the hylafaxplus developer to +# restore tools dropped by original libtiff in version 4.6.0. + +stdenv.mkDerivation (finalAttrs: { + pname = "libtiff_t"; + version = "4.6.0t"; + + src = fetchzip { + url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz"; + hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4="; + }; + + patches = [ + # FreeImage needs this patch + ./headers.patch + # libc++abi 11 has an `#include <version>`, this picks up files name + # `version` in the project's include paths + ./rename-version.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + + # TODO: opengl support (bogus configure detection) + propagatedBuildInputs = [ + libdeflate + libjpeg + xz + zlib + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)"; + homepage = "http://www.libtiff.org"; + changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html"; + maintainers = with maintainers; [ yarny ]; + license = licenses.libtiff; + platforms = platforms.unix ++ platforms.windows; + pkgConfigModules = [ "libtiff-4" ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch b/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch deleted file mode 100644 index 3e93569d4245..000000000000 --- a/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch +++ /dev/null @@ -1,21 +0,0 @@ -fix case-insensitive build ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,7 @@ docfiles = \ - README.md \ - RELEASE-DATE \ - TODO \ -- VERSION -+ VERSION.txt - - EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - - release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) -- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - - pkgconfigdir = $(libdir)/pkgconfig diff --git a/nixpkgs/pkgs/development/libraries/libtommath/default.nix b/nixpkgs/pkgs/development/libraries/libtommath/default.nix index 3ec1ba7b79b3..fc0c9608cf4f 100644 --- a/nixpkgs/pkgs/development/libraries/libtommath/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtommath/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtommath"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - sha256 = "sha256-mGAl17N0J2/uLjDpnzZJ5KwNuKAiV6N+4Q6ucqvtDR8="; + sha256 = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; nativeBuildInputs = [ libtool ]; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix deleted file mode 100644 index 87d6633f124e..000000000000 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, libsodium -, ncurses -, libopus -, libvpx -, check -, libconfig -, pkg-config -}: - -let buildToxAV = !stdenv.isAarch32; -in stdenv.mkDerivation rec { - pname = "libtoxcore"; - version = "0.2.18"; - - src = - # We need the prepared sources tarball. - fetchurl { - url = - "https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz"; - sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI="; - }; - - cmakeFlags = [ - "-DDHT_BOOTSTRAP=ON" - "-DBOOTSTRAP_DAEMON=ON" - ] ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; - - buildInputs = [ - libsodium - ncurses - libconfig - ] ++ lib.optionals buildToxAV [ - libopus - libvpx - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - doCheck = true; - nativeCheckInputs = [ check ]; - - postInstall = '' - substituteInPlace $out/lib/pkgconfig/toxcore.pc \ - --replace '=''${prefix}/' '=' \ - - ''; - # We might be getting the wrong pkg-config file anyway: - # https://github.com/TokTok/c-toxcore/issues/2334 - - meta = with lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype"; - homepage = "https://tox.chat"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ peterhoeg ehmry ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libucl/default.nix b/nixpkgs/pkgs/development/libraries/libucl/default.nix index f684b52a1105..6275a85e6ee2 100644 --- a/nixpkgs/pkgs/development/libraries/libucl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libucl/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "libucl"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "vstakhov"; repo = pname; rev = version; - sha256 = "sha256-uMkILLG2SC+Q+w7jb0PMsaTET2z1V9Ar0lQhXS1K2+g="; + sha256 = "sha256-esNEVBa660rl3Oo2SLaLrFThFkjbqtZ1r0tjMq3h6cM="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libucontext/default.nix b/nixpkgs/pkgs/development/libraries/libucontext/default.nix index 1ce0e443b352..23301648bdf9 100644 --- a/nixpkgs/pkgs/development/libraries/libucontext/default.nix +++ b/nixpkgs/pkgs/development/libraries/libucontext/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "ucontext implementation featuring glibc-compatible ABI"; license = licenses.isc; platforms = platforms.linux; - maintainers = [ maintainers.yuka ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix index 780ae7418dde..678f685d4882 100644 --- a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus dbus-glib gtk3 gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { - homepage = "https://wiki.gnome.org/Attic/LibUnique"; + homepage = "https://gitlab.gnome.org/Archive/unique"; description = "A library for writing single instance applications"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.AndersonTorres ]; diff --git a/nixpkgs/pkgs/development/libraries/libunique/default.nix b/nixpkgs/pkgs/development/libraries/libunique/default.nix index 13dc13e5e968..f75aed442a85 100644 --- a/nixpkgs/pkgs/development/libraries/libunique/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunique/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "https://wiki.gnome.org/Attic/LibUnique"; + homepage = "https://gitlab.gnome.org/Archive/unique"; description = "A library for writing single instance applications"; license = lib.licenses.lgpl21; platforms = with lib.platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/nixpkgs/pkgs/development/libraries/libunwind/default.nix index 66f9f076dab4..5144abc6dc5b 100644 --- a/nixpkgs/pkgs/development/libraries/libunwind/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunwind/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; # https://github.com/libunwind/libunwind#libunwind - platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; + platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix index 5fa18444d0f4..9230e79c46d0 100644 --- a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index 52e1de20327d..fcfeaa81d1ec 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; pkgConfigModules = [ "libuv" ]; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix index f3d58613b25d..e9faec42cd31 100644 --- a/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = finalAttrs.version; - sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; + sha256 = "sha256-X9H5nxbYFSMfxZMxs3iWwCgdrJ2FTVWW7tlgQek3WIg="; }; outputs = [ "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/libvgm/default.nix b/nixpkgs/pkgs/development/libraries/libvgm/default.nix index 0d7c098255f2..0f45c39e0aeb 100644 --- a/nixpkgs/pkgs/development/libraries/libvgm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2024-01-03"; + version = "unstable-2024-04-24"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "223b6f9d629feda1982dc4bbeebd19fa63b987fb"; - hash = "sha256-CrqgDuOsY+Hpp41De6oWJduj8d8ftMUanMEWJKh79rw="; + rev = "1271ab3a0ec1440d2e537ead46165e189671dfd0"; + hash = "sha256-vle9h7+izdpu9fe6LWD06j8oVQIL/lOApPrdjILmPX4="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 72d94ee32989..81dacdb493c9 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -9,6 +9,7 @@ , dnsmasq , docutils , fetchFromGitLab +, fetchpatch , gettext , glib , gnutls @@ -126,6 +127,16 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + (fetchpatch { + name = "CVE-2024-2494.patch"; + url = "https://gitlab.com/libvirt/libvirt/-/commit/8a3f8d957507c1f8223fdcf25a3ff885b15557f2.patch"; + hash = "sha256-kxSIZ4bPOhN6PpJepoSF+EDTgdmazRWh3a3KSVfm1GU="; + }) + (fetchpatch { + name = "CVE-2024-1441.patch"; + url = "https://gitlab.com/libvirt/libvirt/-/commit/c664015fe3a7bf59db26686e9ed69af011c6ebb8.patch"; + hash = "sha256-Qi/gk7+NPz9s9OpWOnF8XW6A75C9BbVxBTE4KVwalo4="; + }) ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; @@ -271,7 +282,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/var/lib" (cfg "install_prefix" (placeholder "out")) (cfg "localstatedir" "/var") - (cfg "runstatedir" "/run") + (cfg "runstatedir" (if isDarwin then "/var/run" else "/run")) (cfg "init_script" (if isDarwin then "none" else "systemd")) (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) diff --git a/nixpkgs/pkgs/development/libraries/libvisual/default.nix b/nixpkgs/pkgs/development/libraries/libvisual/default.nix index 52ea32f75832..2a84b4da0ea1 100644 --- a/nixpkgs/pkgs/development/libraries/libvisual/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvisual/default.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Remove once "sdl-cross-prereq.patch" patch above is removed. "--disable-lv-tool" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" ]; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 0c71611e4772..9e692fc5805e 100644 --- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Netflix/vmaf"; changelog = "https://github.com/Netflix/vmaf/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2Patent; - maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; + maintainers = [ maintainers.cfsmp3 ]; mainProgram = "vmaf"; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 9978082fc60e..a29dd6b2627b 100644 --- a/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.14.2"; + version = "1.16.0"; src = fetchurl { url = "https://wpewebkit.org/releases/libwpe-${version}.tar.xz"; - sha256 = "sha256-iuOAIsUMs0DJb9vuEhfx5Gq1f7wci6mBQlZau+2+Iu8="; + sha256 = "sha256-x/OjxrPQBnkNSG3HzO2ittLjKd4H8zvEffxT8A8zSyo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 78c5d09889aa..1cca2d9222db 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -23,19 +23,9 @@ , testers }: -let - # Newer versions fail with minimal python, probably because - # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b706824b612adb2c8255819c9a55e78b52774a3c - # This case is encountered "temporarily" during stdenv bootstrapping on darwin. - # Beware that the old version has known security issues, so the final set shouldn't use it. - oldVer = python.pname == "python3-minimal"; -in - assert oldVer -> stdenv.isDarwin; # reduce likelihood of using old libxml2 unintentionally - -let -libxml = stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "libxml2"; - version = "2.12.5"; + version = "2.12.6"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" @@ -44,7 +34,7 @@ libxml = stdenv.mkDerivation (finalAttrs: rec { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-qXJ5Zpav04Bz4PWcKDw6L1pWC1JotLq8ORsoYWZSayE="; + hash = "sha256-iJxZOogaPbX92WzJMYyH3zTrZI7fxFgnKtRv1gc1P7s="; }; strictDeps = true; @@ -139,15 +129,4 @@ libxml = stdenv.mkDerivation (finalAttrs: rec { maintainers = with maintainers; [ eelco jtojnar ]; pkgConfigModules = [ "libxml-2.0" ]; }; -}); -in -if oldVer then - libxml.overrideAttrs (attrs: rec { - version = "2.10.1"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - sha256 = "21a9e13cc7c4717a6c36268d0924f92c3f67a1ece6b7ff9d588958a6db9fb9d8"; - }; - }) -else - libxml +}) diff --git a/nixpkgs/pkgs/development/libraries/libzapojit/default.nix b/nixpkgs/pkgs/development/libraries/libzapojit/default.nix index 8acb5e858df8..43f9065dfa61 100644 --- a/nixpkgs/pkgs/development/libraries/libzapojit/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzapojit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = "https://wiki.gnome.org/Projects/Zapojit"; + homepage = "https://gitlab.gnome.org/Archive/libzapojit"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libzim/default.nix b/nixpkgs/pkgs/development/libraries/libzim/default.nix index 50cb0847089b..80d3db6d2e32 100644 --- a/nixpkgs/pkgs/development/libraries/libzim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzim/default.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, icu -, meson -, ninja -, pkg-config -, python3 -, xapian -, xz -, zstd +{ + lib, + stdenv, + fetchFromGitHub, + icu, + meson, + ninja, + pkg-config, + python3, + xapian, + xz, + zstd, }: stdenv.mkDerivation rec { pname = "libzim"; - version = "9.1.0"; + version = "9.2.0"; src = fetchFromGitHub { owner = "openzim"; - repo = pname; + repo = "libzim"; rev = "refs/tags/${version}"; - hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs="; + hash = "sha256-WAbNSrgm/lTARD7Ml4vVLChQLNR23vEZtyE4MXnhnB4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/nixpkgs/pkgs/development/libraries/lightgbm/default.nix index 5f8e6ceaecd0..57d3407aef91 100644 --- a/nixpkgs/pkgs/development/libraries/lightgbm/default.nix +++ b/nixpkgs/pkgs/development/libraries/lightgbm/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = lib.optionals doCheck [ "-DBUILD_CPP_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/cc" ] ++ lib.optionals openclSupport [ "-DUSE_GPU=ON" ] ++ lib.optionals mpiSupport [ "-DUSE_MPI=ON" ] ++ lib.optionals hdfsSupport [ diff --git a/nixpkgs/pkgs/development/libraries/litehtml/default.nix b/nixpkgs/pkgs/development/libraries/litehtml/default.nix index b1864f6497a9..b7626733210d 100644 --- a/nixpkgs/pkgs/development/libraries/litehtml/default.nix +++ b/nixpkgs/pkgs/development/libraries/litehtml/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "litehtml"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { owner = "litehtml"; repo = "litehtml"; rev = "v${finalAttrs.version}"; - hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; + hash = "sha256-ZE/HKzo3ejKpW/ih3sJwn2hzCtsBhAXeJWGezYd6Yc4"; }; # Don't search for non-existant gumbo cmake config @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # Affects build of pkgs that depend on litehtml postPatch = '' substituteInPlace cmake/litehtmlConfig.cmake \ - --replace "find_dependency(gumbo)" "" + --replace-fail "find_dependency(gumbo)" "" ''; nativeBuildInputs = [ @@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DEXTERNAL_GUMBO=ON" + # BuildTesting need to download test data online + "-DLITEHTML_BUILD_TESTING=OFF" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/llhttp/default.nix b/nixpkgs/pkgs/development/libraries/llhttp/default.nix index 15b548af70b3..8bd80151c094 100644 --- a/nixpkgs/pkgs/development/libraries/llhttp/default.nix +++ b/nixpkgs/pkgs/development/libraries/llhttp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}"; license = licenses.mit; pkgConfigModules = [ "libllhttp" ]; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; }) diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/2.nix b/nixpkgs/pkgs/development/libraries/mbedtls/2.nix index 97d62fad3ced..42fb6edae78f 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/2.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.7"; - hash = "sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw="; + version = "2.28.8"; + hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; } diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/3.nix b/nixpkgs/pkgs/development/libraries/mbedtls/3.nix index 267349ac5d7b..d672e218f577 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/3.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,18 @@ -{ callPackage }: +{ callPackage +, fetchpatch +}: callPackage ./generic.nix { - version = "3.5.2"; - hash = "sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM="; + version = "3.6.0"; + hash = "sha256-tCwAKoTvY8VCjcTPNwS3DeitflhpKHLr6ygHZDbR6wQ="; + + patches = [ + # https://github.com/Mbed-TLS/mbedtls/pull/9000 + # Remove at next version update + (fetchpatch { + name = "fix-darwin-memcpy-error.patch"; + url = "https://github.com/Mbed-TLS/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1.patch"; + hash = "sha256-BTkJs9NEkCl+/Q8EwB/LW9uwF95jQOKWmoCK4B/7/sU="; + }) + ]; } diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix b/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix index 2e79a593b7c3..e87a133eb2a1 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix @@ -2,6 +2,7 @@ , stdenv , version , hash +, patches ? [] , fetchFromGitHub , cmake @@ -21,8 +22,12 @@ stdenv.mkDerivation rec { repo = "mbedtls"; rev = "${pname}-${version}"; inherit hash; + # mbedtls >= 3.6.0 uses git submodules + fetchSubmodules = true; }; + inherit patches; + nativeBuildInputs = [ cmake ninja perl python3 ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix b/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix index 0e935fe844b2..1dd85da49538 100644 --- a/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.25.0"; + version = "0.26.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-0m0Rg5Gv7o748iXqHafHvHYX5jHjjnmYE09TbG4PNNY="; + hash = "sha256-DZiipuGXhzrlm49doNeFExApHMDI7ILfOumgXA8useA="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch b/nixpkgs/pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch deleted file mode 100644 index 62915abcf242..000000000000 --- a/nixpkgs/pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 7920b4405b2e..a544e1b25466 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -81,8 +81,8 @@ # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.3"; - hash = "sha256-d67JoqN7fTWW6hZAs8xT0LXZs7Uqvtid4H43F+kb/b4="; + version = "24.0.5"; + hash = "sha256-OMwkXKj6o8adptJof4kGN3AB9jNlNIpizG9/r7HowBg="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -141,11 +141,6 @@ 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 = '' @@ -254,7 +249,8 @@ self = stdenv.mkDerivation { ] ++ [ python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ elfutils libomxil-bellagio libva-minimal udev lm_sensors ] + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ] ++ 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/miniz/default.nix b/nixpkgs/pkgs/development/libraries/miniz/default.nix index 8592dc5f1224..0c4d902f40bb 100644 --- a/nixpkgs/pkgs/development/libraries/miniz/default.nix +++ b/nixpkgs/pkgs/development/libraries/miniz/default.nix @@ -1,29 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, fetchFromGitHub +, nix-update-script +, stdenv +, testers +, validatePkgConfig +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniz"; - version = "2.2.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "richgel999"; - repo = pname; - rev = version; - sha256 = "sha256-7hc/yNJh4sD5zGQLeHjowbUtV/1mUDQre1tp9yKMSSY="; + repo = "miniz"; + rev = finalAttrs.version; + hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; }; + passthru.updateScript = nix-update-script {}; - nativeBuildInputs = [ cmake ]; + strictDeps = true; + nativeBuildInputs = [ cmake validatePkgConfig ]; postFixup = '' - substituteInPlace "$out"/share/pkgconfig/miniz.pc \ - --replace '=''${prefix}//' '=/' \ - --replace '=''${exec_prefix}//' '=/' + substituteInPlace "$out"/lib/pkgconfig/miniz.pc \ + --replace-fail '=''${prefix}//' '=/' \ + --replace-fail '=''${exec_prefix}//' '=/' ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Single C source file zlib-replacement library"; homepage = "https://github.com/richgel999/miniz"; license = licenses.mit; maintainers = with maintainers; [ astro ]; platforms = platforms.unix; + pkgConfigModules = [ "miniz" ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index abe368f2ea62..672bb36609ec 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.22.0"; + version = "7.24.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-vJKpeEdQIWBQRRdDui5ibSZtD8qUlDZBD+UQE+0cQqk="; + hash = "sha256-nQ9uRip6i9+/MziU4gQq1ah712J6f94cFQWTDYRjzyE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix index 576c2e7a9ed4..082c0d9b308f 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.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-LUtKOAlQVpN5Y+mHsNTlgDSeCjodG4RDleO1eXzTdMg="; + hash = "sha256-P0Mavs09FUmHxRYx/70wtjswWnrkQIo0+NrYtW4KJXo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index db9c727f8e0b..02e587661890 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -20,11 +20,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-pkpmeBueUxKtBS0yaJ4jJS90WyfuiBisKsDIIJvAuQ4="; + sha256 = "sha256-IzMbIpnyh8NBlyftwt+JItfnq7uf0Kx04DuZZvmtQtc="; }; outputs = [ "out" "doc" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix b/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix index 25ce9a5520d2..73664813612d 100644 --- a/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msgpack-cxx"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "refs/tags/cpp-${finalAttrs.version}"; - hash = "sha256-VqzFmm3MmMhWyooOsz1d9gwwbn/fnnxpkCFwqKR6los="; + hash = "sha256-m0Ki+9/nZo2b4BUT+gUtdxok5I7xQtcfnMkbG+OHsKs="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/mtdev/default.nix b/nixpkgs/pkgs/development/libraries/mtdev/default.nix index e067e0c3d274..334cda54d1bf 100644 --- a/nixpkgs/pkgs/development/libraries/mtdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtdev/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, fetchurl, evdev-proto }: +{ lib +, stdenv +, fetchurl +, evdev-proto +, gitUpdater +}: stdenv.mkDerivation rec { pname = "mtdev"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "https://bitmath.org/code/mtdev/${pname}-${version}.tar.bz2"; - sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; + hash = "sha256-oQetrSEB/srFSsf58OCg3RVdlUGT2lXCNAyX8v8dgU4="; }; buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto; + passthru.updateScript = gitUpdater { + url = "https://bitmath.org/git/mtdev.git"; + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; diff --git a/nixpkgs/pkgs/development/libraries/mvfst/default.nix b/nixpkgs/pkgs/development/libraries/mvfst/default.nix index 6b6e2d9c9e57..45b432a2dc9e 100644 --- a/nixpkgs/pkgs/development/libraries/mvfst/default.nix +++ b/nixpkgs/pkgs/development/libraries/mvfst/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mvfst"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "mvfst"; rev = "v${version}"; - sha256 = "sha256-vhLwxA91v+vt5PQejhPOaj9YSkulg86hTD9GkpQKB24="; + sha256 = "sha256-KjNTDgpiR9EG42Agl2JFJoPo5+8GlS27oPMWpdLq2v8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/nixpkgs/pkgs/development/libraries/ncnn/default.nix index 71b4bbc8fd42..f140b9c1ab1f 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20240102"; + version = "20240410"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - hash = "sha256-kk70oLY+2QJOkyYq10whLRMxBuibQMWMOBA9dcbKf/I="; + hash = "sha256-UiaU+LCevrWBxZg5LAimGIJB0CElWBnO6qoadUc3VVM="; }; patches = [ @@ -33,7 +33,9 @@ stdenv.mkDerivation rec { "-DNCNN_BUILD_TOOLS=0" "-DNCNN_SYSTEM_GLSLANG=1" "-DNCNN_PYTHON=0" # Should be an attribute - ]; + ] + # Requires setting `Vulkan_LIBRARY` on Darwin. Otherwise the build fails due to missing symbols. + ++ lib.optionals stdenv.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ vulkan-headers vulkan-loader glslang opencv protobuf ]; diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix index a14a7267a187..cb4a38cded27 100644 --- a/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.2"; + version = "5.2.4"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-d90088MKliM90KSbL0TNEafhfvLQlD/stO5V83fTXO0="; + hash = "sha256-1+nC5Io459T/Czr6bTfdGy2GB5MMrhK+EBLQIPIX5QM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix index 06eb1b815069..b691f2b10afa 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, avahi, obs-studio-plugins }: +{ lib, stdenv, fetchurl, avahi, obs-studio-plugins }: let versionJSON = lib.importJSON ./version.json; @@ -15,20 +15,10 @@ stdenv.mkDerivation rec { majorVersion = builtins.head (builtins.splitVersion version); installerName = "Install_NDI_SDK_v${majorVersion}_Linux"; - src = requireFile rec { - name = "${installerName}.tar.gz"; - sha256 = versionJSON.hash; - message = '' - In order to use NDI SDK version ${version}, you need to comply with - NewTek's license and download the appropriate Linux tarball from: - - ${meta.homepage} - - Once you have downloaded the file, please use the following command and - re-run the installation: - - \$ nix-prefetch-url file://\$PWD/${name} - ''; + src = fetchurl { + name = "${pname}-${version}.tar.gz"; + url = "https://downloads.ndi.tv/SDK/NDI_SDK_Linux/${installerName}.tar.gz"; + hash = versionJSON.hash; }; buildInputs = [ avahi ]; @@ -52,6 +42,8 @@ stdenv.mkDerivation rec { if [ -L "$i" ]; then continue; fi patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i" done + rm $out/bin/libndi.so.${majorVersion} + ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.${majorVersion} mv include examples $out/ mkdir -p $out/share/doc/${pname}-${version} mv licenses $out/share/doc/${pname}-${version}/licenses diff --git a/nixpkgs/pkgs/development/libraries/ndi/version.json b/nixpkgs/pkgs/development/libraries/ndi/version.json index 686abdb2c2b7..1631cd03e8fb 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/version.json +++ b/nixpkgs/pkgs/development/libraries/ndi/version.json @@ -1 +1 @@ -{"hash": "sha256:4ff4b92f2c5f42d234aa7d142e2de7e9b045c72b46ad5149a459d48efd9218de", "version": "5.6.0"} +{"hash": "sha256:0wh5bqy9xx08wnfah92pgs4f6xn6mwfyhwdzbhf5ghkbw8pc7z0w", "version": "5.6.1"} diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index 805fe6e3bb20..5566b0c8f67d 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.60.0"; + version = "1.61.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-W4wmgdQstLMcs+DaDggb+jAl1cNZKN6PYHAVUgFbAM4="; + sha256 = "sha256-Toz37DLUxaQwlmJC1yA10lXNlHCodm1h7tegGQ3VRP0="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 76de14079deb..849a464b1c0d 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -1,31 +1,33 @@ { lib, stdenv, fetchFromGitHub , cmake -, cunit, ncurses +, CoreServices , curlHTTP3 }: stdenv.mkDerivation rec { pname = "nghttp3"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-B/5r0mRpOEi5DQ7OUAAcDmAm1nnak6qNz4qjDrzWlDc="; + hash = "sha256-kJt4aQGNiJ0XhlEKunR8jYKytv3rh23jRrNelCDe/Kk="; + fetchSubmodules = true; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cunit ncurses ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; cmakeFlags = [ - "-DENABLE_STATIC_LIB=OFF" + (lib.cmakeBool "ENABLE_STATIC_LIB" false) ]; doCheck = true; - enableParallelBuilding = true; passthru.tests = { inherit curlHTTP3; diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index 948fb0c071f4..6a0e15dfcd9c 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -1,34 +1,40 @@ { lib, stdenv, fetchFromGitHub , cmake -, cunit, ncurses -, libev, nghttp3, quictls +, brotli, libev, nghttp3, quictls +, CoreServices , withJemalloc ? false, jemalloc , curlHTTP3 }: stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-/lHsHkSySKyZZdjTTYCo0a6cwcMcbOWNvAEcO36/kEw="; + hash = "sha256-te/kFt7/09QpmkHZ7dJxyKvvxP+mHtIQIgESkJATR38="; + fetchSubmodules = true; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cunit ncurses ]; - buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; + buildInputs = [ + brotli + libev + nghttp3 + quictls + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ] ++ lib.optional withJemalloc jemalloc; cmakeFlags = [ - "-DENABLE_STATIC_LIB=OFF" + (lib.cmakeBool "ENABLE_STATIC_LIB" false) ]; doCheck = true; - enableParallelBuilding = true; passthru.tests = { inherit curlHTTP3; diff --git a/nixpkgs/pkgs/development/libraries/nng/default.nix b/nixpkgs/pkgs/development/libraries/nng/default.nix index 34f0aee7d707..612f8e384570 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.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-oP7hO3wCXNPW7877wK+HpGsw7j+U0q4i8aTRVi1v0r0="; + hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; }; nativeBuildInputs = [ cmake ninja ] @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals mbedtlsSupport [ mbedtls ]; - cmakeFlags = [ "-G Ninja" "-DNNG_ENABLE_TLS=ON" ] - ++ lib.optionals mbedtlsSupport [ "-DMBEDTLS_ROOT_DIR=${mbedtls}" ]; + cmakeFlags = [ "-G Ninja" ] + ++ lib.optionals mbedtlsSupport [ "-DMBEDTLS_ROOT_DIR=${mbedtls}" "-DNNG_ENABLE_TLS=ON" ]; meta = with lib; { homepage = "https://nng.nanomsg.org/"; diff --git a/nixpkgs/pkgs/development/libraries/npth/default.nix b/nixpkgs/pkgs/development/libraries/npth/default.nix index 023d9cebb973..1ca747048e33 100644 --- a/nixpkgs/pkgs/development/libraries/npth/default.nix +++ b/nixpkgs/pkgs/development/libraries/npth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgsCross }: stdenv.mkDerivation rec { pname = "npth"; @@ -9,8 +9,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-hYn1aTe3XOM7KNMS/MvzArO3HsPzlF/eaqp0AnkUrQU="; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=patch;h=417abd56fd7bf45cd4948414050615cb1ad59134"; + hash = "sha256-0g2tLFjW1bybNi6oxlW7vPimsQLjmTih4JZSoATjESI="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + doCheck = true; + passthru.tests = { + musl = pkgsCross.musl64.npth; + }; + meta = with lib; { description = "The New GNU Portable Threads Library"; mainProgram = "npth-config"; diff --git a/nixpkgs/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix index be67a95ebfc5..8b426654147f 100644 --- a/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ode"; - version = "0.16.4"; + version = "0.16.5"; src = fetchurl { url = "https://bitbucket.org/odedevs/ode/downloads/ode-${finalAttrs.version}.tar.gz"; - hash = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; + hash = "sha256-uode3RZFcJWHle6qcPFIU7/DTMmHH4rd6NpH4SvVRnk="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index 6749be599a40..890170c28808 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -112,8 +112,8 @@ let in { ogre_14 = common { - version = "14.2.2"; - hash = "sha256-85hpujmlM3N81mkiA80xx2C4GsdzWkP61bwdfmw1zt8="; + version = "14.2.4"; + hash = "sha256-Gr72KNjxZPZtFrgsbevPYiVog/fQNvJHvQEH0WA2DW4="; # https://github.com/OGRECave/ogre/blob/v14.2.2/Components/Overlay/CMakeLists.txt imguiVersion = "1.90.4"; imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 44ff2ee1f88a..1fcf4a1f00e2 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.4"; + version = "3.4.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-uV/Skp//tGy/hZBeN2NCbectlSoaz+H0ukYQd2j1lC4="; + hash = "sha256-6iPcytsRWvDn2hg5tkSG6A3cv/aOhmEVd5rS2uOKCPk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 4ece5feea365..43a7f7950473 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -133,7 +133,6 @@ effectiveStdenv.mkDerivation rec { nlohmann_json microsoft-gsl ] ++ lib.optionals pythonSupport (with python3Packages; [ - gtest numpy pybind11 packaging @@ -150,7 +149,9 @@ effectiveStdenv.mkDerivation rec { cuda_cudart ]); - nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ + nativeCheckInputs = [ + gtest + ] ++ lib.optionals pythonSupport (with python3Packages; [ pytest sympy onnx @@ -179,7 +180,7 @@ effectiveStdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_BUILD_UNIT_TESTS=ON" + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) "-Donnxruntime_ENABLE_LTO=ON" "-Donnxruntime_USE_FULL_PROTOBUF=OFF" (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) @@ -190,6 +191,7 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") ]; env = lib.optionalAttrs effectiveStdenv.cc.isClang { @@ -224,6 +226,7 @@ effectiveStdenv.mkDerivation rec { ''; passthru = { + inherit cudaSupport cudaPackages; # for the python module protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; diff --git a/nixpkgs/pkgs/development/libraries/open62541/default.nix b/nixpkgs/pkgs/development/libraries/open62541/default.nix index b8c22a73dd4e..0ddc010deb65 100644 --- a/nixpkgs/pkgs/development/libraries/open62541/default.nix +++ b/nixpkgs/pkgs/development/libraries/open62541/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-FnLMR54xjIyYRqwCnvMJsNgsVwH7hVAixCNGhfIZPiw="; + hash = "sha256-FekO0cKgpYulMXz4r0/TUPz2tawC4k3Sq07Og4xqh4I="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 377ebb3acdb5..5e9409368cc7 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -39,7 +39,7 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let - inherit (cudaPackages) cudatoolkit; + inherit (cudaPackages) backendStdenv cudatoolkit; inherit (cudaPackages.cudaFlags) cudaCapabilities; version = "3.4.18"; @@ -241,7 +241,7 @@ stdenv.mkDerivation { (opencvFlag "TBB" enableTbb) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" diff --git a/nixpkgs/pkgs/development/libraries/openexr/3.nix b/nixpkgs/pkgs/development/libraries/openexr/3.nix index a59c9795b223..074fdf4222d3 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -5,17 +5,18 @@ , imath , libdeflate , pkg-config +, pkgsCross }: stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-7KBjZpImSaW4GiK0ZCpMcjBPQ9aMmN5LW+/m6lkGK68="; + hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM="; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 doCheck = !stdenv.isAarch32; + passthru.tests = { + musl = pkgsCross.musl64.openexr_3; + }; + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com"; diff --git a/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch b/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch index f8fff65aceb4..f1ceb13d3a01 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch +++ b/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch @@ -1,13 +1,13 @@ diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 44d9185d..8ffcd2b2 100644 +index 25f429da..918f56e9 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt -@@ -4,7 +4,7 @@ - # We require this to get object library link library support and +@@ -5,7 +5,7 @@ # combined python 2 + 3 support --add_subdirectory(IexTest) -+#add_subdirectory(IexTest) - add_subdirectory(OpenEXRCoreTest) - add_subdirectory(OpenEXRTest) - add_subdirectory(OpenEXRUtilTest) + if (OPENEXR_TEST_LIBRARIES) +- add_subdirectory(IexTest) ++ #add_subdirectory(IexTest) + add_subdirectory(OpenEXRCoreTest) + add_subdirectory(OpenEXRTest) + add_subdirectory(OpenEXRUtilTest) diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index c0b4fe75b610..359ed2832d24 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -309,4 +309,27 @@ in { license = licenses.asl20; }; }; + + openssl_3_3 = common { + version = "3.3.0"; + hash = "sha256-U+ZrBDMipgar8Ah+dpmg4DOjf6E/65dC3zXDozsY+wI="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./3.2/use-etc-ssl-certs-darwin.patch + else ./3.2/use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; } diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index c89baab7936b..ec4c327d784b 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.34"; + version = "1.1.36"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-AzqGNFJozmtivj+gXYHPZX2iYginQ2gXbLCImhMH9Jc="; + sha256 = "sha256-Ki2tp8a67AjIMIGDpWWqCnpMmeZpJ8uPezKE2KWrOjA="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index fc722257a9c1..34288773705a 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.51.0"; + version = "1.51.2"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dO/BCa5vkDu+avd+qirGCUuO4kWi4j8TKnqPCGLRqfU="; + sha256 = "sha256-PbpAfytfwRfhkvMCXwocyO3B/ZuTSxxXiyuXNCE5QVo="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/parson/default.nix b/nixpkgs/pkgs/development/libraries/parson/default.nix index a1f5c9a7285d..6ba47491ecb4 100644 --- a/nixpkgs/pkgs/development/libraries/parson/default.nix +++ b/nixpkgs/pkgs/development/libraries/parson/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://github.com/kgabis/parson"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/nixpkgs/pkgs/development/libraries/pcre2/default.nix index 4d1c256e301b..23234c40e3f8 100644 --- a/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { hash = "sha256-4qU5hP8LB9/bWuRIa7ubIcyo598kNAlsyb8bcow1C8s="; }; + postPatch = '' + # Fix jit autodetection: + # https://github.com/PCRE2Project/pcre2/pull/396 + # Applying manually to avoid fetchpatch and autoreconfHook. + # TODO: remove once 10.44 is released + substituteInPlace configure --replace-fail \ + '#include "src/sljit/sljitConfigInternal.h"' \ + '#include "src/sljit/sljitConfigCPU.h"' + ''; + configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 3459112456fe..48f2dec6b89b 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -76,7 +76,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.0.4"; + version = "1.0.5"; outputs = [ "out" @@ -92,7 +92,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-LROI1rGQELlGXkapX3XfDqB7Rc5YAOdCwaMQUG/iU8c="; + sha256 = "sha256-lgrwN83eywMKdsm0ig9QATDt3U5RboJ4kyILE+ts9Ts="; }; patches = [ @@ -206,7 +206,7 @@ stdenv.mkDerivation(finalAttrs: { meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; - changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${version}"; + changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${finalAttrs.version}"; homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index c60ac184978a..2e2ef053a119 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.0"; + version = "0.5.2"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-zcYZvyGsGuiwuL9nOD5mW6RFwa9cPB9HvoQqdw2jlmY="; + hash = "sha256-SXLHQbjh4IygV+925fsPXgj7DFIPQj48oLNKWkUhuK8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index e18bc6450206..3a83c89cd05d 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY="; }; + # Raise test timeout, 120s can be slightly exceeded on slower hardware + postPatch = '' + substituteInPlace test/meson.build \ + --replace-fail 'timeout : 120' 'timeout : 240' + ''; + separateDebugInfo = !stdenv.hostPlatform.isStatic; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix index 2358d19240a2..029767aaa608 100644 --- a/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.12.5p2"; + version = "1.13.2"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - sha256 = "sha256-UAseNOC9n+OooDl4E67qcndJ02fAgmp2d8Ii/IyPvhg="; + sha256 = "sha256-GcwkGiui9j9RzMQyEEmqq8dxWzKpv5xWxJgvJpSMdbw="; rev = "poco-${version}-release"; }; diff --git a/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix b/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix index 6c4356e9add9..93c989a9c1ec 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix @@ -53,10 +53,6 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; - postInstall = '' - moveToOutput lib "$lib" - ''; - meta = { homepage = "https://github.com/podofo/podofo"; description = "A library to work with the PDF file format"; diff --git a/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix index 1243763421c0..85651d225f42 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix @@ -24,8 +24,13 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; - postInstall = '' - moveToOutput lib "$lib" + postPatch = '' + # Use GNU directories to fix multiple outputs + failNoMatches='t yes; b no; :yes h; :no p; $ {x; /./{x;q}; q1}' + sed -ni src/podofo/CMakeLists.txt \ + -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches" + sed -ni src/podofo/libpodofo.pc.in \ + -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/pslib/default.nix b/nixpkgs/pkgs/development/libraries/pslib/default.nix index 94dead43a43e..98aaa5dcf335 100644 --- a/nixpkgs/pkgs/development/libraries/pslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/pslib/default.nix @@ -14,13 +14,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg giflib libtiff ]; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + doCheck = true; outputs = [ "out" "dev" "doc" ]; installPhase = '' mkdir -p $out/lib - for path in *.so *.so.* *.o *.o.*; do + for path in *.dylib *.so *.so.* *.o *.o.*; do mv $path $out/lib/ done mkdir -p $dev/include @@ -39,5 +43,6 @@ stdenv.mkDerivation rec { "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; license = licenses.gpl2; maintainers = with maintainers; [ ShamrockLee ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix index d238b8137d33..2b7ac684974e 100644 --- a/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -1,39 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, - qtwebengine, qtxmlpatterns, - qttools, unzip }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + python3, + qmake, + qtwebengine, + qtxmlpatterns, + qttools, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "python-qt"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; - rev = "v${version}"; - hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Mpi1pAPS/UuzaBK7I1kI0HlS3dphcKiVXIPuJwdEDXM="; }; - # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt - postPatch = '' - substituteInPlace build/python.prf \ - --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" - ''; - - hardeningDisable = [ "all" ]; - - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; + nativeBuildInputs = [ + qmake + qttools + qtxmlpatterns + qtwebengine + ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; qmakeFlags = [ - "PythonQt.pro" - "PYTHON_DIR=${python}" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; dontWrapQtApps = true; - unpackCmd = "unzip $src"; - installPhase = '' mkdir -p $out/include/PythonQt cp -r ./lib $out @@ -42,6 +45,15 @@ stdenv.mkDerivation rec { cp -r ./extensions $out/include/PythonQt ''; + preFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib + install_name_tool -id \ + $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ + $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib + ''; + meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "https://pythonqt.sourceforge.net/"; @@ -49,4 +61,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix index e1e69b9f10b4..0c50c9e3649b 100644 --- a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,31 +1,51 @@ -{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }: +{ lib, stdenv, qtbase, qtdeclarative, fetchFromGitHub, cmake, pkg-config, box2d }: + +let + inherit (lib) cmakeBool; + + # 2.3.1 is the only supported version + box2d' = (box2d.override { settingsFile = "Box2D/Common/b2Settings.h"; }).overrideAttrs (old: rec { + version = "2.3.1"; + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + rev = "v${version}"; + hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; + }; + sourceRoot = "source/Box2D"; + cmakeFlags = old.cmakeFlags or [ ] ++ [ + (cmakeBool "BOX2D_INSTALL" true) + (cmakeBool "BOX2D_BUILD_SHARED" true) + (cmakeBool "BOX2D_BUILD_EXAMPLES" false) + ]; + }); + +in stdenv.mkDerivation { pname = "qml-box2d"; - version = "unstable-2018-04-06"; + version = "unstable-2022-08-25"; + src = fetchFromGitHub { owner = "qml-box2d"; repo = "qml-box2d"; - sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7"; - rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; + rev = "0bb88a6f871eef72b3b9ded9329c15f1da1f4fd7"; + hash = "sha256-sfSVetpHIAIujpgjvRScAkJRlQQYjQ/yQrkWvp7Yu0s="; }; dontWrapQtApps = true; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtdeclarative ]; + nativeBuildInputs = [ cmake pkg-config ]; - patchPhase = '' - substituteInPlace box2d.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" - qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" - ''; + buildInputs = [ box2d' qtbase qtdeclarative ]; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + cmakeFlags = [ + (cmakeBool "USE_SYSTEM_BOX2D" true) + ]; meta = with lib; { description = "A QML plugin for Box2D engine"; homepage = "https://github.com/qml-box2d/qml-box2d"; - maintainers = [ maintainers.guibou ]; + maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; license = licenses.zlib; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 6334217f7458..80d75b8cf880 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -197,6 +197,11 @@ let ]; qtwebkit = [ (fetchpatch { + name = "qtwebkit-python39-json.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch"; + sha256 = "yCX/UL666BPxjnxT6rIsUrJsPcSWHhZwMFJfuHhbkhk="; + }) + (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index ea65e5f3ae82..c4b851207954 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -15,10 +15,6 @@ , buildPackages , python3 , config - - # options -, developerBuild ? false -, debug ? false }: let @@ -32,7 +28,10 @@ let callPackage = self.newScope ({ inherit (self) qtModule; inherit srcs python3; - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = + if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } + else stdenv; }); in { @@ -44,21 +43,19 @@ let qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; - inherit developerBuild; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch - ./patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch - ./patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0006-qtbase-find-tools-in-PATH.patch - ./patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch - ./patches/0008-qtbase-allow-translations-outside-prefix.patch - ./patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch - ./patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch - ./patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch + ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch + ./patches/0005-qtbase-find-tools-in-PATH.patch + ./patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0007-qtbase-allow-translations-outside-prefix.patch + ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch + ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch + ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch # Revert "macOS: Silence warning about supporting secure state restoration" # fix build with macOS sdk < 12.0 (fetchpatch2 { @@ -168,7 +165,7 @@ let ({ qtModule }: qtModule.override { stdenv = if stdenv.isDarwin - then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } else stdenv; }) { }; @@ -195,16 +192,13 @@ let name = "qmake6-hook"; propagatedBuildInputs = [ qtbase.dev ]; substitutions = { - inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; } ./hooks/qmake-hook.sh) { }; } // lib.optionalAttrs config.allowAliases { - # Convert to a throw on 03-01-2023 and backport the change. - # Warnings show up in various cli tool outputs, throws do not. - # Remove completely before 24.05 - overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Remove completely before 24.11 + overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; }; baseScope = makeScopeWithSplicing' { diff --git a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index 52c6fb5f1b2e..a9c84b483238 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.3/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 8c4ce096443f..130e8290a3fe 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -18,12 +18,6 @@ qmakePrePhase() { "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" ) - if [ -n "@debug@" ]; then - qmakeFlags+=("CONFIG+=debug") - else - qmakeFlags+=("CONFIG+=release") - fi - qmakeFlags+=("${qmakeFlags_orig[@]}") } prePhases+=" qmakePrePhase" diff --git a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 9bc68e6cd3d6..5006d6b65530 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -15,20 +15,6 @@ else # Only set up Qt once. . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ - # Disable debug symbols if qtbase was built without debugging. - # This stops -dev paths from leaking into other outputs. - if [ -z "@debug@" ]; then - NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" - fi - - # Integration with CMake: - # Set the CMake build type corresponding to how qtbase was built. - if [ -n "@debug@" ]; then - cmakeBuildType="Debug" - else - cmakeBuildType="Release" - fi - # Build tools are often confused if QMAKE is unset. export QMAKE=@out@/bin/qmake diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index a14028e1259a..a327b88991ef 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -92,13 +92,10 @@ # options , libGLSupported ? stdenv.hostPlatform.isLinux , libGL -, debug ? false -, developerBuild ? false , qttranslations ? null }: let - debugSymbols = debug || developerBuild; isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; in stdenv.mkDerivation rec { @@ -106,8 +103,6 @@ stdenv.mkDerivation rec { inherit src version; - debug = debugSymbols; - propagatedBuildInputs = [ libxml2 libxslt @@ -195,7 +190,6 @@ stdenv.mkDerivation rec { CoreBluetooth ] ++ lib.optional withGtk3 gtk3 - ++ lib.optional developerBuild gdb ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; @@ -266,8 +260,6 @@ stdenv.mkDerivation rec { patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so ''; - dontStrip = debugSymbols; - dontWrapQtApps = true; setupHook = ../hooks/qtbase-setup-hook.sh; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 697556e30edc..e1ed990dc0b3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -3,16 +3,28 @@ , qtlanguageserver , qtshadertools , openssl +, stdenv , python3 +, lib +, pkgsBuildBuild }: qtModule { pname = "qtdeclarative"; - propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ]; + strictDeps = !stdenv.isDarwin; # fails to detect python3 otherwise + propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ]; + nativeBuildInputs = [ python3 ]; patches = [ # prevent headaches from stale qmlcache data - ../patches/qtdeclarative-default-disable-qmlcache.patch + ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch # add version specific QML import path - ../patches/qtdeclarative-qml-paths.patch + ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch + ]; + cmakeFlags = [ + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools" + ] + # Conditional is required to prevent infinite recursion during a cross build + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index a9660b73710b..fc12a5fb1112 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.2"; + version = "6.7.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM="; + hash = "sha256-LUYb4Wb1fLUwIvDOsVU/iSOyx9pcfPrmiFnQskbT2d8="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 5c9a0e58a82c..ba24fbe9294b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -22,18 +22,32 @@ , libunwind , orc , VideoToolbox +, pkgsBuildBuild }: qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libunwind orc ffmpeg_6 ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; - propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] + buildInputs = [ ffmpeg_6 ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; - cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ]; + patches = [ + ../patches/fix-qtgui-include-incorrect-case.patch + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ../patches/qtmultimedia-windows-no-uppercase-libs.patch + ../patches/qtmultimedia-windows-resolve-function-name.patch + ]; + + cmakeFlags = [ + "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools" + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h"; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index f07aeefa0be0..e6f785cd833c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -122,9 +122,6 @@ qtModule { hardeningDisable = [ "format" ]; patches = [ - # removes macOS 12+ dependencies - ../patches/qtwebengine-darwin-no-low-latency-flag.patch - ../patches/qtwebengine-darwin-no-copy-certificate-chain.patch # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index de35178f7929..a8bb8f71cdbf 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,8 +1,8 @@ -From 90734859d2f9e6b9a1754c3e694ceb1a3c870bce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute - path in qmake files +Subject: [PATCH] qtbase: qmake: always use libname instead of absolute path in + qmake files In generated qmake files, absolute paths to qt libraries are embedded and then used in linker flags. However as the libraries can be provided @@ -45,6 +45,3 @@ index 3ffe354fd8d..441332d4582 100644 list(APPEND out_list "${lib_name_with_link_flag}") else() list(APPEND out_list "${library_path}") --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch index a204d52c9f0c..9afcc8240ab3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch @@ -1,4 +1,4 @@ -From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 11:12:27 -0400 Subject: [PATCH] qtdeclarative: disable qml disk cache @@ -8,10 +8,10 @@ Subject: [PATCH] qtdeclarative: disable qml disk cache 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index d1b4c4fff6..50f8a07420 100644 +index 506b920142..3cadb4fe06 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const +@@ -2202,11 +2202,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { if (forceDiskCache()) return DiskCache::Enabled; @@ -24,6 +24,3 @@ index d1b4c4fff6..50f8a07420 100644 } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index 6cdbec5abfc7..1e548950a2a6 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,19 +1,19 @@ -From a804a9b1efdab0a71b9947e5c2bf9f6f5e316e0e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin +Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin --- mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 263 -------------------------- + mkspecs/features/mac/default_post.prf | 264 -------------------------- mkspecs/features/mac/default_pre.prf | 58 ------ mkspecs/features/mac/sdk.mk | 27 --- mkspecs/features/mac/sdk.prf | 61 ------ mkspecs/features/mac/toolchain.prf | 5 - - 6 files changed, 1 insertion(+), 415 deletions(-) + 6 files changed, 1 insertion(+), 416 deletions(-) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 +index 61bea952b22..9909dae7260 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,7 +26,7 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 0b64a586b9..3b40328304 100644 +index 0b64a586b93..3b40328304d 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -311,7 +311,7 @@ index 0b64a586b9..3b40328304 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 +index e3534561a56..3b01424e67b 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -376,7 +376,7 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6c..e69de29bb2 100644 +index a32ceacb6ce..e69de29bb2d 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -408,7 +408,7 @@ index a32ceacb6c..e69de29bb2 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bb..e69de29bb2 100644 +index 3a9c2778bbe..e69de29bb2d 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -474,7 +474,7 @@ index 3a9c2778bb..e69de29bb2 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c..e69de29bb2 100644 +index df191eb13c4..e69de29bb2d 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch index 39b7a30892cf..d857d7ac1bba 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch @@ -1,8 +1,17 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Wed, 7 Feb 2024 11:49:04 -0500 +Subject: [PATCH] qtdeclarative: also use versioned qml paths + +--- + src/qml/qml/qqmlimport.cpp | 1 + + 1 file changed, 1 insertion(+) + diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 2e482c220d..4873809bec 100644 +index f9cc8da240..f8cb033be0 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp -@@ -1517,6 +1517,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) +@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) // env import paths addEnvImportPath("QML_IMPORT_PATH"); addEnvImportPath("QML2_IMPORT_PATH"); diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch index 53f226254a19..f2f9425841a8 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -1,14 +1,14 @@ -From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 09:34:46 +0800 -Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config +Subject: [PATCH] qtbase: qmake: fix includedir in generated pkg-config --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 11d2f0ff7df..c78ed0d3485 100644 +index 482ef2e2697..49217e62cda 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() @@ -21,6 +21,3 @@ index 11d2f0ff7df..c78ed0d3485 100644 if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") && libDir != QLatin1String("/Library/Frameworks")) { t << " -F${libdir}"; --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch deleted file mode 100644 index ccd0fb02fcd8..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82e243f326aea40e7f3da935d8166979b11e8063 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 21 Mar 2023 15:48:49 +0800 -Subject: [PATCH 04/11] qtbase: deal with a font face at index 0 as Regular for - Variable fonts - -Reference: https://bugreports.qt.io/browse/QTBUG-111994 ---- - src/gui/text/unix/qfontconfigdatabase.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp -index 474644b871f..c7a117fd134 100644 ---- a/src/gui/text/unix/qfontconfigdatabase.cpp -+++ b/src/gui/text/unix/qfontconfigdatabase.cpp -@@ -556,6 +556,7 @@ void QFontconfigDatabase::populateFontDatabase() - FcObjectSetAdd(os, *p); - ++p; - } -+ FcPatternAddBool(pattern, FC_VARIABLE, FcFalse); - fonts = FcFontList(nullptr, pattern, os); - FcObjectSetDestroy(os); - FcPatternDestroy(pattern); --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch new file mode 100644 index 000000000000..56d19e0bb817 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Wed, 12 Apr 2023 10:13:50 +0800 +Subject: [PATCH] qtbase: qt-cmake: always use cmake from path + +The generated qt-cmake scripts embeds the absolute path of cmake used +during the build of qtbase, bloating the runtime closure of qtbase. +--- + bin/qt-cmake-create.in | 7 +------ + bin/qt-cmake.in | 7 +------ + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/bin/qt-cmake-create.in b/bin/qt-cmake-create.in +index 7865d0fe91b..884dc4aba93 100755 +--- a/bin/qt-cmake-create.in ++++ b/bin/qt-cmake-create.in +@@ -7,12 +7,7 @@ HELP_MESSAGE="Usage + script_dir_path=`dirname $0` + script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` + +-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +-original_cmake_path="@CMAKE_COMMAND@" +-cmake_path=$original_cmake_path +-if ! test -f "$cmake_path"; then +- cmake_path="cmake" +-fi ++cmake_path="cmake" + + if [ "$#" -gt 1 ]; then + echo "Invalid number of arguments" +diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in +index f719257f602..571ffe788fa 100755 +--- a/bin/qt-cmake.in ++++ b/bin/qt-cmake.in +@@ -4,12 +4,7 @@ + script_dir_path=`dirname $0` + script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` + +-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +-original_cmake_path="@CMAKE_COMMAND@" +-cmake_path=$original_cmake_path +-if ! test -f "$cmake_path"; then +- cmake_path="cmake" +-fi ++cmake_path="cmake" + + toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" + diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch index 1d60684e0700..df1b67654b61 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch @@ -1,7 +1,7 @@ -From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: rewine <luhongxu@deepin.org> Date: Wed, 29 Mar 2023 11:51:33 +0800 -Subject: [PATCH 06/11] qtbase-find-tools-in-PATH +Subject: [PATCH] qtbase: find tools in PATH 1. find qt's tools in `QTTOOLSPATH` env qt assumes that all components use the same install prefix @@ -19,10 +19,10 @@ Subject: [PATCH 06/11] qtbase-find-tools-in-PATH 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake -index 48ed5a324bf..91d8d41fb1f 100644 +index 8b631e88ca5..922639a9985 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake -@@ -47,9 +47,14 @@ function(qt_internal_add_docs) +@@ -72,9 +72,14 @@ function(qt_internal_add_docs) set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") endif() @@ -40,6 +40,3 @@ index 48ed5a324bf..91d8d41fb1f 100644 get_target_property(target_type ${target} TYPE) if (NOT target_type STREQUAL "INTERFACE_LIBRARY") --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch deleted file mode 100644 index ad30ebc71413..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b480022b364b262d5ff63738c02318da925f5c79 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Wed, 12 Apr 2023 10:13:50 +0800 -Subject: [PATCH 05/11] qtbase: qt-cmake: always use cmake from path - -The generated qt-cmake scripts embeds the absolute path of cmake used -during the build of qtbase, bloating the runtime closure of qtbase. ---- - bin/qt-cmake.in | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in -index f719257f602..571ffe788fa 100755 ---- a/bin/qt-cmake.in -+++ b/bin/qt-cmake.in -@@ -4,12 +4,7 @@ - script_dir_path=`dirname $0` - script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` - --# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. --original_cmake_path="@CMAKE_COMMAND@" --cmake_path=$original_cmake_path --if ! test -f "$cmake_path"; then -- cmake_path="cmake" --fi -+cmake_path="cmake" - - toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" - --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch index 7bf2193bc208..de4c12ef0448 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -1,17 +1,17 @@ -From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:12:56 -0400 -Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH +Subject: [PATCH] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH --- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 2ae4f998944..ba10ae02bcd 100644 +index b7ee93f6fc1..57b68627eba 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1300,6 +1300,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); @@ -25,6 +25,3 @@ index 2ae4f998944..ba10ae02bcd 100644 // run qmlimportscanner QProcess qmlImportScanner; qmlImportScanner.start(qmlImportScannerPath, argumentList); --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch index 07f1973d7607..d8061f1610e9 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch @@ -1,14 +1,14 @@ -From 79da6bb6ff075e8cf972be8a462630f1ec86bf0a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:14:40 -0400 -Subject: [PATCH 08/11] qtbase: allow translations outside prefix +Subject: [PATCH] qtbase: allow translations outside prefix --- - cmake/QtBuild.cmake | 2 +- + cmake/QtBuildPathsHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index edc43f2f14..78fa219515 100644 +index 18082ac6a5f..e16aea7d7c6 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch index fb17a539f053..597dd7e6550d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch @@ -1,8 +1,7 @@ -From d503be89320f0b89b80acb19769971e855be6ae1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> Date: Wed, 9 Aug 2023 16:16:21 +0200 -Subject: [PATCH 09/11] qtbase: find qmlimportscanner in macdeployqt via - environment +Subject: [PATCH] qtbase: find qmlimportscanner in macdeployqt via environment The qmlimportscanner tool is provided by qtdeclarative. Because of the modularized installation in Nix, it can not be found via the usual @@ -17,10 +16,10 @@ a workaround for users. 1 file changed, 4 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index ba10ae02bcd..320095a972d 100644 +index 57b68627eba..2b972a76c49 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1277,6 +1277,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1280,6 +1280,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; @@ -31,6 +30,3 @@ index ba10ae02bcd..320095a972d 100644 // Verify that we found a qmlimportscanner binary if (!QFile::exists(qmlImportScannerPath)) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch index ed749cb238a5..890c68a97f77 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -1,8 +1,8 @@ -From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:17:00 -0400 -Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does - actually exist +Subject: [PATCH] qtbase: check in the QML folder of this library does actually + exist In a modularized installation, this folder will be the location where `qtbase` itself is installed, but `qtbase` does not have any QML @@ -12,10 +12,10 @@ code, and `qmlimportscanner` will complain that it does not exist. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 320095a972d..87ba0d4e24b 100644 +index 2b972a76c49..96c61b3824a 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1300,9 +1300,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; @@ -30,6 +30,3 @@ index 320095a972d..87ba0d4e24b 100644 // In a modularized installation of qt as we have in Nix, instead, we will // read the paths from the environment, as they are spread in multiple --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch index cae39e879120..b950b7d4ac79 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch @@ -1,17 +1,17 @@ -From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> Date: Sun, 10 May 2020 12:47:28 +0200 -Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH +Subject: [PATCH] qtbase: derive plugin load path from PATH --- src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index a80efbb5622..0d41dabeed3 100644 +index 1ce2642cf2d..48fd91a0d7f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked() +@@ -3038,6 +3038,15 @@ QStringList QCoreApplication::libraryPathsLocked() app_libpaths->append(installPathPlugins); } @@ -27,6 +27,3 @@ index a80efbb5622..0d41dabeed3 100644 // If QCoreApplication is not yet instantiated, // make sure we add the application path when we construct the QCoreApplication if (self) self->d_func()->appendApplicationPathToLibraryPaths(); --- -2.43.1 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch new file mode 100644 index 000000000000..563906fb3157 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +index affa52d..b71b461 100644 +--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp ++++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +@@ -7,7 +7,7 @@ + #include <private/qabstractvideobuffer_p.h> + #include <private/qmultimediautils_p.h> + #include <private/qwindowsmultimediautils_p.h> +-#include <qtgui/qscreen_platform.h> ++#include <QtGui/qscreen_platform.h> + #include "qvideoframe.h" + + #include <qloggingcategory.h> diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch new file mode 100644 index 000000000000..05f009bacdad --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +index c0fbb53..3c82085 100644 +--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp ++++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +@@ -14,7 +14,7 @@ + #include <qwaitcondition.h> + #include <qmutex.h> + +-#include "D3d11.h" ++#include "d3d11.h" + #include "dxgi1_2.h" + + #include <system_error> diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch new file mode 100644 index 000000000000..681e36e0c513 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch @@ -0,0 +1,30 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp +index aac77ae..71ffed6 100644 +--- a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp ++++ b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp +@@ -42,11 +42,7 @@ static QString windowTitle(HWND hwnd) { + return QString::fromStdWString(buffer); + } + +-QList<QCapturableWindow> QWinCapturableWindows::windows() const +-{ +- QList<QCapturableWindow> result; +- +- auto windowHandler = [](HWND hwnd, LPARAM lParam) { ++static int __stdcall windowHandler(HWND hwnd, LPARAM lParam) { + if (!canCaptureWindow(hwnd)) + return TRUE; // Ignore window and continue enumerating + +@@ -58,7 +54,11 @@ QList<QCapturableWindow> QWinCapturableWindows::windows() const + windows.push_back(windowData.release()->create()); + + return TRUE; +- }; ++} ++ ++QList<QCapturableWindow> QWinCapturableWindows::windows() const ++{ ++ QList<QCapturableWindow> result; + + ::EnumWindows(windowHandler, reinterpret_cast<LPARAM>(&result)); + diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch deleted file mode 100644 index c7e461945c04..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/3rdparty/chromium/net/cert/x509_util_apple.cc b/src/3rdparty/chromium/net/cert/x509_util_apple.cc -index ae69948dfca..7062a9a9b97 100644 ---- a/src/3rdparty/chromium/net/cert/x509_util_apple.cc -+++ b/src/3rdparty/chromium/net/cert/x509_util_apple.cc -@@ -139,11 +139,6 @@ SHA256HashValue CalculateFingerprint256(SecCertificateRef cert) { - - base::ScopedCFTypeRef<CFArrayRef> CertificateChainFromSecTrust( - SecTrustRef trust) { -- if (__builtin_available(macOS 12.0, iOS 15.0, *)) { -- return base::ScopedCFTypeRef<CFArrayRef>( -- SecTrustCopyCertificateChain(trust)); -- } -- - base::ScopedCFTypeRef<CFMutableArrayRef> chain( - CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks)); - const CFIndex chain_length = SecTrustGetCertificateCount(trust); diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch deleted file mode 100644 index 3df917edf5cc..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -index d4b0161b2e..e5a0eb1967 100644 ---- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -+++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -@@ -29,12 +29,6 @@ - #include "media/base/video_types.h" - #include "media/video/video_encode_accelerator.h" - --// This is a min version of macOS where we want to support SVC encoding via --// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, --// but there we see frame drops even with ample bitrate budget. Excessive frame --// drops were fixed in 12.0.1. --#define LOW_LATENCY_FLAG_AVAILABLE_VER 12.0.1 -- - namespace media { - - namespace { -@@ -277,8 +271,6 @@ VTVideoEncodeAccelerator::GetSupportedH264Profiles() { - profile.rate_control_modes = VideoEncodeAccelerator::kConstantMode | - VideoEncodeAccelerator::kVariableMode; - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T1); -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) -- profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); - - for (const auto& supported_profile : kSupportedProfiles) { - if (VideoCodecProfileToVideoCodec(supported_profile) == VideoCodec::kH264) { -@@ -814,14 +806,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( - encoder_values.push_back(kCFBooleanFalse); - } - -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- // Remove the validation once HEVC SVC mode is supported on macOS. -- if (require_low_delay_ && codec == VideoCodec::kH264) { -- encoder_keys.push_back( -- kVTVideoEncoderSpecification_EnableLowLatencyRateControl); -- encoder_values.push_back(kCFBooleanTrue); -- } -- } - base::ScopedCFTypeRef<CFDictionaryRef> encoder_spec = - video_toolbox::DictionaryWithKeysAndValues( - encoder_keys.data(), encoder_values.data(), encoder_keys.size()); -@@ -891,19 +875,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession(VideoCodec codec) { - - // Remove the validation once HEVC SVC mode is supported on macOS. - if (num_temporal_layers_ == 2 && codec_ == VideoCodec::kH264) { -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- if (!session_property_setter.IsSupported( -- kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) { -- DLOG(ERROR) << "BaseLayerFrameRateFraction is not supported"; -- return false; -- } -- rv &= session_property_setter.Set( -- kVTCompressionPropertyKey_BaseLayerFrameRateFraction, 0.5); -- DLOG_IF(ERROR, !rv) << " Setting BaseLayerFrameRate property failed."; -- } else { - DLOG(ERROR) << "SVC encoding is not supported on this OS version."; - rv = false; -- } - } - - return rv; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 5edd42d3004e..767755fcbd87 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "0v6zprw9r4z4inj7mg364n959c6japklm7ji2952nm3i01zp8jd5"; - name = "qt3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "0934i5b90hyxk8s58ji7mc062wdsxlvb45y79ygvfcl6psl84fw0"; + name = "qt3d-everywhere-src-6.7.0.tar.xz"; }; }; qt5compat = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt5compat-everywhere-src-6.6.3.tar.xz"; - sha256 = "02zcrrh6rq5p6bqix5nk2h22rfqdrf4d0h7y4rva5zmbbr7czhk8"; - name = "qt5compat-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz"; + sha256 = "1x8r9rjkyxhn2fzhj53z7biqd0hxkka5rdp0cc5s9n25hgyx8jcx"; + name = "qt5compat-everywhere-src-6.7.0.tar.xz"; }; }; qtactiveqt = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtactiveqt-everywhere-src-6.6.3.tar.xz"; - sha256 = "0balhrmzmjrqn6h2r3rr00776vxhdpqzwhk9knrlvix8i1kr86x1"; - name = "qtactiveqt-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtactiveqt-everywhere-src-6.7.0.tar.xz"; + sha256 = "1cyh6h4829pjsklks1agym6gzz7pz2hbydvfqd190izv2fi8a125"; + name = "qtactiveqt-everywhere-src-6.7.0.tar.xz"; }; }; qtbase = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtbase-everywhere-src-6.6.3.tar.xz"; - sha256 = "0qklvzg242ilxw29jd2vsz6s8ni4dpraf4ghfa4dykhc705zv4q4"; - name = "qtbase-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz"; + sha256 = "0m5jp0rh5965d242s68wdvrxy3x1a6z3p89y8lxhxysj5sgf5chi"; + name = "qtbase-everywhere-src-6.7.0.tar.xz"; }; }; qtcharts = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtcharts-everywhere-src-6.6.3.tar.xz"; - sha256 = "1rbz2nm8wrdf060cssvs69b5kqv0ybxjqw1clm5mdllg2j38i5jh"; - name = "qtcharts-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz"; + sha256 = "193w5grxndh0gfnyfipn7jdlskfz5b43h97zwbyh3yqvr6c597c9"; + name = "qtcharts-everywhere-src-6.7.0.tar.xz"; }; }; qtconnectivity = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtconnectivity-everywhere-src-6.6.3.tar.xz"; - sha256 = "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"; - name = "qtconnectivity-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz"; + sha256 = "0k14f7fqhychxj9j6xwad9yp7wjf7ps5f427l65krxwzq6mddbq7"; + name = "qtconnectivity-everywhere-src-6.7.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdatavis3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "1gyz83hkmjin3fr3brg00qchbb0awprwx99idysrc6chckj825wv"; - name = "qtdatavis3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdatavis3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "1a8v150bva3v9njhma7424jbczjb76l7pgzw61b0qyck326j94ss"; + name = "qtdatavis3d-everywhere-src-6.7.0.tar.xz"; }; }; qtdeclarative = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdeclarative-everywhere-src-6.6.3.tar.xz"; - sha256 = "1wwjlwjb3hnlpai4rrrdsm096a6ahb1izs3524r79jpjzhn7n805"; - name = "qtdeclarative-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz"; + sha256 = "0b4yz9c4lba9p5xgzaymz3a8fwl8s1p8cb0nh6jwrmvlk9bkj32s"; + name = "qtdeclarative-everywhere-src-6.7.0.tar.xz"; }; }; qtdoc = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdoc-everywhere-src-6.6.3.tar.xz"; - sha256 = "1j7awdbg7c0slbyhld8cdbx4dic7hhqv3g1qka809bjcxa2hb188"; - name = "qtdoc-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdoc-everywhere-src-6.7.0.tar.xz"; + sha256 = "0h4w06rc8xz31iy5g8cmxs9d0p9pd6nxlyjp2k6bbr2dq085w7lr"; + name = "qtdoc-everywhere-src-6.7.0.tar.xz"; }; }; qtgraphs = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgraphs-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ppdas6bl22z69w8wdy7xl0f1kyqja2gwjd4cn6kjmsslws5rhi2"; - name = "qtgraphs-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgraphs-everywhere-src-6.7.0.tar.xz"; + sha256 = "15clif3warl4hbgdjbpnpfgy4mi2y8hkj5sc4afhzbv2gsbd2dab"; + name = "qtgraphs-everywhere-src-6.7.0.tar.xz"; }; }; qtgrpc = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgrpc-everywhere-src-6.6.3.tar.xz"; - sha256 = "11q9cqqk8bs3k6n5pxys2r4fisbs3xvv8d8lsi7wm25rqh5qv1kj"; - name = "qtgrpc-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgrpc-everywhere-src-6.7.0.tar.xz"; + sha256 = "18gsi9sb4v4q2g0ccmf6nkj37vzixaaha3mk882p3qys250b26dp"; + name = "qtgrpc-everywhere-src-6.7.0.tar.xz"; }; }; qthttpserver = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qthttpserver-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dbqx36ywfmqi4nxfi4dl17scj9nkl8sbpb670ffy3nh8pbpib21"; - name = "qthttpserver-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qthttpserver-everywhere-src-6.7.0.tar.xz"; + sha256 = "1ylvz3cny3g68lqdcy2bqii1820nyaspn28dybp7wlr15f5y7qn2"; + name = "qthttpserver-everywhere-src-6.7.0.tar.xz"; }; }; qtimageformats = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtimageformats-everywhere-src-6.6.3.tar.xz"; - sha256 = "0z328i6fix1qdklfbs1w4dsr64zavjj5kzqvzipww0v62xhfm99w"; - name = "qtimageformats-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtimageformats-everywhere-src-6.7.0.tar.xz"; + sha256 = "19r9q233pwiqqf57khdv1qfnjkqxnzfk7zhnk32i2nnxr1zf0v2i"; + name = "qtimageformats-everywhere-src-6.7.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlanguageserver-everywhere-src-6.6.3.tar.xz"; - sha256 = "136gyvkzm6skdv5yhyy4nqhbczfc2mn4nbr9hvpkpljb0awv888h"; - name = "qtlanguageserver-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz"; + sha256 = "1z69fqgqbbipwfhlabs0z6axx4br1a1qjk404jnbgxxx58scp7m9"; + name = "qtlanguageserver-everywhere-src-6.7.0.tar.xz"; }; }; qtlocation = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlocation-everywhere-src-6.6.3.tar.xz"; - sha256 = "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p"; - name = "qtlocation-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlocation-everywhere-src-6.7.0.tar.xz"; + sha256 = "0snl7a8fax0771hqaa0g653f0428x7c546zc4vsrinqppik4s15v"; + name = "qtlocation-everywhere-src-6.7.0.tar.xz"; }; }; qtlottie = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlottie-everywhere-src-6.6.3.tar.xz"; - sha256 = "1d0fjb0080wnd71f50zwal1b504iimln9mpnb3sc5yznmv8gm4cq"; - name = "qtlottie-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlottie-everywhere-src-6.7.0.tar.xz"; + sha256 = "1vd27g93kjala7849ny3n4nw0xg2j7ba2i682fyhdq4r7kggn3ww"; + name = "qtlottie-everywhere-src-6.7.0.tar.xz"; }; }; qtmultimedia = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtmultimedia-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"; - name = "qtmultimedia-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtmultimedia-everywhere-src-6.7.0.tar.xz"; + sha256 = "0w4c0yyzgfhm6vd4qkxllh2cqw5q3giybqf9n2iyckixkvjbm57k"; + name = "qtmultimedia-everywhere-src-6.7.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtnetworkauth-everywhere-src-6.6.3.tar.xz"; - sha256 = "153mpg4hv3nclcdrkbzkalg4xf5k6r64fj003b725zyp885s7fax"; - name = "qtnetworkauth-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtnetworkauth-everywhere-src-6.7.0.tar.xz"; + sha256 = "0iaalz7kpbjzjcrf5nmcw7322mq381s4jakfh8yks8phdxhhaccr"; + name = "qtnetworkauth-everywhere-src-6.7.0.tar.xz"; }; }; qtpositioning = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtpositioning-everywhere-src-6.6.3.tar.xz"; - sha256 = "1frzzndsscb6iqschklks2l17ppnjpnx1lq1cypnq3x0598bcdws"; - name = "qtpositioning-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtpositioning-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pwxc2fhwvmq0mwrv9fak3d1bh23b7maxshyp0fs1j167jj1nq0x"; + name = "qtpositioning-everywhere-src-6.7.0.tar.xz"; }; }; qtquick3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "1qls5cydhm7p1g3gqzvnism8k0h6wjzi8x12gn51dapvnzq2cxlr"; - name = "qtquick3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "046rgvvf4a37b0anqn1h814231ibw8kxk4yd9yvk7ab57yzl7fcb"; + name = "qtquick3d-everywhere-src-6.7.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; - sha256 = "0ipma4qdmzyyajs5inp7d3znh2hfx42gia7x9ahqpb515r49pqb7"; - name = "qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; + sha256 = "1rh41sadi5l2yypskhwrcjii0llkdq2msh0bgj0g7wq924k5y140"; + name = "qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; - sha256 = "0mr350c9kj74g48lavq5z5c604cdgcyycfdpwv5z8bmbr49jl95w"; - name = "qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; + sha256 = "1m84pjw4d2gvypgajz21xcl9di1vmswqwb0nd763bjk181kfq3rx"; + name = "qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquicktimeline-everywhere-src-6.6.3.tar.xz"; - sha256 = "0b266w7al90fbbp16w506klba50d4izf6nfcmmp5fpr6h5pxvcyk"; - name = "qtquicktimeline-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquicktimeline-everywhere-src-6.7.0.tar.xz"; + sha256 = "1gc96jva2nm7a3zv5zwmhrvifjlngngddm3kaivmfpbbdiy6aigb"; + name = "qtquicktimeline-everywhere-src-6.7.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtremoteobjects-everywhere-src-6.6.3.tar.xz"; - sha256 = "16bd4zd3yfzlzk087qphphsh8hv38q3a57n1yknvkc5fchzmfzjz"; - name = "qtremoteobjects-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtremoteobjects-everywhere-src-6.7.0.tar.xz"; + sha256 = "15f6wjszl5mxjrjd8r36l3x3p1nzhgib33bb7743ywf94pb61fm0"; + name = "qtremoteobjects-everywhere-src-6.7.0.tar.xz"; }; }; qtscxml = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtscxml-everywhere-src-6.6.3.tar.xz"; - sha256 = "1dbcw4qnss5rif97gdcimyzl3jqa508yph611dvvhc1xn16nl6qg"; - name = "qtscxml-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtscxml-everywhere-src-6.7.0.tar.xz"; + sha256 = "0z15m5l44asp4masjxmkxqcc4x93v6n8i12qswrzfvbnp2xrfnvj"; + name = "qtscxml-everywhere-src-6.7.0.tar.xz"; }; }; qtsensors = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsensors-everywhere-src-6.6.3.tar.xz"; - sha256 = "0r9p3lm159pji29vq9kii42jkz4rg15hqh6zlq9442i58a0ayddj"; - name = "qtsensors-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsensors-everywhere-src-6.7.0.tar.xz"; + sha256 = "1axwywwgygcri1pfjyaiqa7hd7kivya0gr0q11v4z9ih18h1ac0w"; + name = "qtsensors-everywhere-src-6.7.0.tar.xz"; }; }; qtserialbus = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialbus-everywhere-src-6.6.3.tar.xz"; - sha256 = "1yyh1bh5pjlilcq84fgfw6wd0jak55wndwf0sn92lbhsp3y5lghl"; - name = "qtserialbus-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pbnpfazgpaqzi1sz141sh9sqygibb25crk7byjzhr06hslr70a9"; + name = "qtserialbus-everywhere-src-6.7.0.tar.xz"; }; }; qtserialport = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialport-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"; - name = "qtserialport-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz"; + sha256 = "1jc1g46pgjy39vyk7inzx0kx6iziy54kgjkwz8pvmj4wihyjmw5i"; + name = "qtserialport-everywhere-src-6.7.0.tar.xz"; }; }; qtshadertools = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtshadertools-everywhere-src-6.6.3.tar.xz"; - sha256 = "1rm17hyhq244zskq3ar3h22qjd5dshy84nnyq1ivhg5k7gb0j2cc"; - name = "qtshadertools-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz"; + sha256 = "1bwqg5gn2nfm61950yhcv9q93qd2fb2cnm77074ia21gqrkzj4ry"; + name = "qtshadertools-everywhere-src-6.7.0.tar.xz"; }; }; qtspeech = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtspeech-everywhere-src-6.6.3.tar.xz"; - sha256 = "1yh3r5zbhgwkjgs7yk6iv2w23766n1i4z8vjkkw5awdixx3gfa76"; - name = "qtspeech-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtspeech-everywhere-src-6.7.0.tar.xz"; + sha256 = "048z7lqvpqi4073lx7s83d9kqbfg59banapi7qiw4j3xhfx8wxj4"; + name = "qtspeech-everywhere-src-6.7.0.tar.xz"; }; }; qtsvg = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsvg-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ir57bis27whq7bwqykk1qlxy0522k4ia39brxayjmfadrbixjsa"; - name = "qtsvg-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz"; + sha256 = "0bcjpwzggrqp2gf9a1xp8g0klh9kn2amnvp2lr9n2ppz107g860m"; + name = "qtsvg-everywhere-src-6.7.0.tar.xz"; }; }; qttools = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttools-everywhere-src-6.6.3.tar.xz"; - sha256 = "1h0vz46mpvzbm5w6sgpk0b3mqkn278l45arhxxk41dwc5n14qvda"; - name = "qttools-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz"; + sha256 = "0yzfmfqwn0y534z47yyk71236nnsq0v0kgsw8qiixzl2kqinpnn8"; + name = "qttools-everywhere-src-6.7.0.tar.xz"; }; }; qttranslations = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttranslations-everywhere-src-6.6.3.tar.xz"; - sha256 = "1kvkrwbgby4i69dpxbxxcv0qbsz69n6icpyr4wcf8qm2r4m5zqqj"; - name = "qttranslations-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttranslations-everywhere-src-6.7.0.tar.xz"; + sha256 = "0mjbx9n8fh4xp9r0r4p9ynjy1iirzn3bwlyr3g6vm91c0r3q1z16"; + name = "qttranslations-everywhere-src-6.7.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; - sha256 = "0d517x60birlf8xb3sphchvgm235f8q1868q98kg76plzfhq57wq"; - name = "qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; + sha256 = "0snbl1wd5s76c8ab76bsqi3bp94h1isdwavbjm6gc1hvifhv46yn"; + name = "qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; }; }; qtwayland = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwayland-everywhere-src-6.6.3.tar.xz"; - sha256 = "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9"; - name = "qtwayland-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz"; + sha256 = "1sks2m2phf841zl0d4sn7krm6f1ppgl7wl9arpc8i8vx47j70d6p"; + name = "qtwayland-everywhere-src-6.7.0.tar.xz"; }; }; qtwebchannel = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebchannel-everywhere-src-6.6.3.tar.xz"; - sha256 = "0cwcf4pri901piyj0lvqmks9l84di9rcafnfgrmgg5mls7jjlyvw"; - name = "qtwebchannel-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebchannel-everywhere-src-6.7.0.tar.xz"; + sha256 = "1zzg49ii59sw64m98phsbhf97kx7nxp7k0ggxazbz0hc9r0bvgr6"; + name = "qtwebchannel-everywhere-src-6.7.0.tar.xz"; }; }; qtwebengine = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebengine-everywhere-src-6.6.3.tar.xz"; - sha256 = "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw"; - name = "qtwebengine-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebengine-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pj7q5r8wa49faxijljfnbmzbpmqc7bwcal0mcwz9haxcd1s8nqs"; + name = "qtwebengine-everywhere-src-6.7.0.tar.xz"; }; }; qtwebsockets = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebsockets-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dm066lv3n97ril9iyd5xn8j13m6r7xp844aagj6dpclaxv83x0n"; - name = "qtwebsockets-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz"; + sha256 = "0dlp2ck0pkg9say92qism438i5j3ybxs0xf90j7g3k9ndgd7gz2z"; + name = "qtwebsockets-everywhere-src-6.7.0.tar.xz"; }; }; qtwebview = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebview-everywhere-src-6.6.3.tar.xz"; - sha256 = "00jcxzi9wcbviscn5y0h0mkbac88lpjammg3zvfvjih7avgn6r10"; - name = "qtwebview-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebview-everywhere-src-6.7.0.tar.xz"; + sha256 = "1yawx8vd7blky5b8mxpby4k1zwgm91jvl98y17xf47yc71qy069n"; + name = "qtwebview-everywhere-src-6.7.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 63e02e98ff74..a7372dfba22e 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-i+QjVPSzWNPVQmQkB+u/3Wrvqqoz5OIjRdyZKXzxZh4="; + hash = "sha256-cGMS0lEtgd64rjeEfYwJplf9rva0FtpaQMCfxyramE8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 8d385afc148d..0ac930710bf4 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.5"; + version = "6.14.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZPfyJAQHtE5ae/X9f8s/69UNiB4CnyACPLvYp8RgpKg="; + hash = "sha256-pg2SaFfFkP2v1qHo8CRCn7b9B4XKX+R4UqRNzNG4to4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/quantlib/default.nix b/nixpkgs/pkgs/development/libraries/quantlib/default.nix index 6dcf59928615..a0ca48b1afd8 100644 --- a/nixpkgs/pkgs/development/libraries/quantlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/quantlib/default.nix @@ -7,25 +7,33 @@ stdenv.mkDerivation rec { pname = "quantlib"; - version = "1.29"; + version = "1.34"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "lballabio"; repo = "QuantLib"; - rev = "QuantLib-v${version}"; - sha256 = "sha256-TpVn3zPru/GtdNqDH45YdOkm7fkJzv/qay9SY3J6Jiw="; + rev = "v${version}"; + sha256 = "sha256-qrMaIBiDg7bFtWTDAQgAMtekb/7VrI7Ix+G59mU4WHI="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; + # Required by RQuantLib, may be beneficial for others too + cmakeFlags = [ "-DQL_HIGH_RESOLUTION_DATE=ON" ]; + + # Needed for RQuantLib and possible others + postInstall = '' + cp ./quantlib-config $out/bin/ + ''; + meta = with lib; { description = "A free/open-source library for quantitative finance"; homepage = "https://quantlib.org"; platforms = platforms.unix; license = licenses.bsd3; - maintainers = []; + maintainers = [ maintainers.kupac ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/quarto/default.nix b/nixpkgs/pkgs/development/libraries/quarto/default.nix index 99b9ebf79ae8..78dc32fbbf55 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.552"; + version = "1.4.554"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-I6uRqKgwb+VnbghA20BXEGrrLKOERc/IfF1TIDoymBw="; + sha256 = "sha256-/RID+nqjMAEg2jzTBYc/8hz/t+k4TJlks7oCJ5YrjIY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/quictls/default.nix b/nixpkgs/pkgs/development/libraries/quictls/default.nix index 110ecb4907e1..49dfc94993e4 100644 --- a/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quictls"; - version = "3.1.4-quic1"; + version = "3.1.5-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "openssl-${finalAttrs.version}"; - hash = "sha256-WOWoY6rmAAUvuWWXPTWsllUkew5ZIULjL1CEg/RRPsE="; + rev = "cb6841b741544bfd8868c1641ce96a934985509e"; + hash = "sha256-oR46jefarUGmBYjjpEvtKFzIOgSXSy58cLdX+P5ocA8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index a1ce524be2f0..65f4b899d747 100644 --- a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd-lts }: stdenv.mkDerivation rec { pname = "raft-canonical"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; passthru.tests = { - inherit lxd; + inherit lxd-lts; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ab0a5edb7d42..0a2967d0fcb1 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.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-4J2j+/0ZVMNlrgLbEQk3me/EX07TZ/rLsT1/5ufxbic="; + hash = "sha256-urMdK+6ORHRgisppb700jaQpxLXAvXVjd8WDN7Zky3A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix index af4fcf30153c..eb77106fd29f 100644 --- a/nixpkgs/pkgs/development/libraries/rnnoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix @@ -1,28 +1,84 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchurl, fetchzip, autoreconfHook, writeScript, fetchpatch +, modelUrl ? "", modelHash ? "" # Allow overriding the model URL and hash +}: -stdenv.mkDerivation (rec { +let + modelVersionJSON = lib.importJSON ./model-version.json; + + # Copy from https://gitlab.xiph.org/xiph/rnnoise/-/raw/v${version}/model_version + default_model_version = modelVersionJSON.version; + + # Either use the default model or the one provided by package override + model_url = if (modelUrl == "") then "https://media.xiph.org/rnnoise/models/rnnoise_data-${default_model_version}.tar.gz" else modelUrl; + model_hash = if (modelHash == "") then modelVersionJSON.hash else modelHash; + +in stdenv.mkDerivation (finalAttrs: { pname = "rnnoise"; - version = "2021-01-22"; + version = "0.2"; + + src = fetchzip { + urls = [ + "https://gitlab.xiph.org/xiph/rnnoise/-/archive/v${finalAttrs.version}/rnnoise-v${finalAttrs.version}.tar.gz" + "https://github.com/xiph/rnnoise/archive/v${finalAttrs.version}.tar.gz" + ]; + hash = "sha256-Qaf+0iOprq7ILRWNRkBjsniByctRa/lFVqiU5ZInF/Q="; + }; + + patches = [ + # remove when updating + (fetchpatch { + url = "https://github.com/xiph/rnnoise/commit/372f7b4b76cde4ca1ec4605353dd17898a99de38.patch"; + hash = "sha256-Dzikb59hjVxd1XIEj/Je4evxtGORkaNcqE+zxOJMSvs="; + }) + ]; - src = fetchFromGitHub { - owner = "xiph"; - repo = "rnnoise"; - rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd"; - sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb"; + model = fetchurl { + url = model_url; + hash = model_hash; }; + postPatch = '' + tar xvomf ${finalAttrs.model} + ''; + nativeBuildInputs = [ autoreconfHook ]; postInstall = '' install -Dt $out/bin examples/.libs/rnnoise_demo ''; - meta = with lib; { + passthru.updateScript = writeScript "update-rnnoise.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts nix nix-prefetch findutils moreutils + + prefetch-sri() { + nix-prefetch-url "$1" | xargs nix hash to-sri --type sha256 + } + + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/xiph/rnnoise/tags?per_page=1")" + + version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + + model_version=$(curl -sL "https://raw.githubusercontent.com/xiph/rnnoise/v$version/model_version") + model_url="https://media.xiph.org/rnnoise/models/rnnoise_data-$model_version.tar.gz" + model_hash="$(prefetch-sri $model_url)" + + modelJson=pkgs/development/libraries/rnnoise/model-version.json + + jq --arg version "$model_version" \ + --arg hash "$model_hash" \ + '.version = $version | .hash = $hash' \ + "$modelJson" | sponge "$modelJson" + ''; + + meta = { description = "Recurrent neural network for audio noise reduction"; homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; - license = licenses.bsd3; - maintainers = [ maintainers.nh2 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nh2 ]; mainProgram = "rnnoise_demo"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json b/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json new file mode 100644 index 000000000000..830f8cc36018 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json @@ -0,0 +1,4 @@ +{ + "version": "0b50c45", + "hash": "sha256-SsgcXAiE7EvVkHAmqq4WIJt7ds2df3GvWCCUovmPS0M=" +} diff --git a/nixpkgs/pkgs/development/libraries/robin-map/default.nix b/nixpkgs/pkgs/development/libraries/robin-map/default.nix index b4c865dbd11b..6a593ec070dc 100644 --- a/nixpkgs/pkgs/development/libraries/robin-map/default.nix +++ b/nixpkgs/pkgs/development/libraries/robin-map/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-axVMJHTnGW2c4kGcYhEEAvKbVKYA2oxiYfwjiz7xh6Q="; + hash = "sha256-dspOWp/8oNR0p5XRnqO7WtPcCx54/y8m1cDho4UBYyc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 6c2aaaa8815a..e1518b6662f6 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "8.3.2"; + version = "9.1.0"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; + hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix b/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix index 46c16c9cc437..380405217e3d 100644 --- a/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { passthru.tests = { apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; - curl = curl.override { opensslSupport = false; rustlsSupport = true; }; + # Currently broken notably because of https://github.com/curl/curl/issues/13248 + # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index a8c8a22ff1bb..8ef3df499261 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.4.6"; + version = "1.4.9"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-x4/AkmkmuTKxzlk8AxbydA4GctpShsKiFTTJ8m7B4TY="; + hash = "sha256-YH35+kCvPjeBYMMJi7YdAGk/ds3YPm5SSKpoWfbCI3M="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index f0d25defe122..50ba7e8273fa 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-3MeF2G/rr//c7cgGzqDzmqoNKvR+7Kkbid1g8znKPkg="; + hash = "sha256-sbs20BbAnvHTtJEuTWMCJrjzyvH7NSXS1+Ah5BdJZHA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 4dd80c3f0275..3b512a3976dc 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -6,7 +6,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${version}"; - hash = "sha256-KNoyYldZWsXB9ubu0EYDgckRtpQgSCmzKlx7Erx4MRQ="; + hash = "sha256-u5UpI6ll2TnI02xWSaZRC5v6BOT0EHaQ2md5iY/Ymjs="; }; indi-firmware = callPackage ./indi-firmware.nix { inherit version; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch b/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch deleted file mode 100644 index 0f886a8a63a5..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt -index 3f68e6dd..822de4e5 100644 ---- a/avogadro/qtplugins/templatetool/CMakeLists.txt -+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt -@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool - ) - - # Install the fragments --set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments") -+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments") - - # Look in parallel directory for the molecule fragment repository - if(NOT EXISTS "${_fragments}") diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix index a93b8f32cef2..6c4061c4c05b 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, cmake, msgpack } : -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mmtf-cpp"; version = "1.1.0"; src = fetchFromGitHub { owner = "rcsb"; - repo = pname; - rev = "v${version}"; + repo = "mmtf-cpp"; + rev = "v${finalAttrs.version}"; hash = "sha256-8JrNobvekMggS8L/VORKA32DNUdXiDrYMObjd29wQmc="; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/rcsb/mmtf-cpp"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 2c9aa745ba12..c32379f26592 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { description = "BLAS-compatible linear algebra library"; homepage = "https://github.com/flame/blis"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with maintainers; [ stephen-huan ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index cb45787e1403..d2f6b1ee8aec 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix index c1eed9bf432a..f1e851ef444d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix @@ -7,11 +7,11 @@ }: let - suitesparseVersion = "7.6.0"; + suitesparseVersion = "7.7.0"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.3.2"; + version = "3.3.3"; outputs = [ "bin" "out" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${suitesparseVersion}"; - hash = "sha256-zZXbUNXxVi4mpI4j4GjyVYraoPFWcuep9q5jl1XdqEo="; + hash = "sha256-wE1DKC0Hn3Q9X1FzKH7Kev26ICNWH0LEKQIQP98AGuo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch index 6a3c7bee051e..f3a34de9304e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch @@ -1,12 +1,12 @@ diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index 168febb34b6..71068469066 100644 +index 672a62a..a5fd1c4 100644 --- a/src/snes/tutorials/makefile +++ b/src/snes/tutorials/makefile @@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 168febb34b6..71068469066 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,7 +30,7 @@ index 168febb34b6..71068469066 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ else \ @@ -38,7 +38,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ else \ @@ -46,7 +46,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ else \ @@ -54,7 +54,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_cuda: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ else \ @@ -62,7 +62,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ else \ @@ -70,7 +70,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ else \ @@ -78,7 +78,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ else \ @@ -86,7 +86,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ else \ @@ -94,7 +94,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ else \ diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 85aa5c4a8736..2f8d3dbe15de 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -63,6 +63,14 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlagsArray = [ "ARGS=--timeout 10000" ]; + postFixup = '' + # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated + # cmake file will thus look for the library in the dev output instead of out. + # Use the absolute path to $out instead to fix the issue. + substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}" "$out" + ''; + meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; diff --git a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 63f8792d0a34..ec95184707d0 100644 --- a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-t1lk0gW72uQrLbeLdvlFzYEvOarbW2ya7sK6Ru3FW+o="; + hash = "sha256-0yFRDQ/f0oVbpZ4wev28xCTVkbXr58Tt0Czda3ppRWk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 9e28ea4eed38..b836220efaff 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.8.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-1WxQU9WAIZKVoNTYJRnwxLAloBfW1g5XSPH4b29x9rE="; + sha256 = "sha256-Az5QZNnzLYpEE7O+1/VceIT6vykkg8vMuAuN9u8OseM="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/soundtouch/default.nix b/nixpkgs/pkgs/development/libraries/soundtouch/default.nix index c337edfa0917..2778f7ff6f7c 100644 --- a/nixpkgs/pkgs/development/libraries/soundtouch/default.nix +++ b/nixpkgs/pkgs/development/libraries/soundtouch/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "soundtouch"; repo = "soundtouch"; rev = version; - sha256 = "sha256-+RprzCn0NCueHhDkk2Lgg7Ihw8JDzu25eIVoVZwF+BA="; + sha256 = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index c62f54b14091..46ee5600a4da 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -11,9 +11,10 @@ , openssl , pkg-config , zlib +, zstd , libpcap , libnl -, libelf +, elfutils , jansson , ensureNewerSourcesForZipFilesHook }: @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { jansson libaio libbsd - libelf + elfutils libuuid libpcap libnl @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { openssl ncurses zlib + zstd ]; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/spglib/default.nix b/nixpkgs/pkgs/development/libraries/spglib/default.nix index e33f18e50b7b..fe585e9d6ea2 100644 --- a/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "2.3.1"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.4.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-MOre1LGf7Li+tAqtzpuEvAX6q/P0ueDlMXhhmtiE+jw="; + hash = "sha256-Y6WkN3Q1q4h2TqrlKSKFmFxQZQWKmleRHV74PmYyw2A="; }; nativeBuildInputs = [ cmake gfortran gtest ]; diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index 64362243229b..655233362e15 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-/I9dJlBE0kvFvqooKuqMETtOE72Jmva3zIGnq0o4+aE="; + hash = "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 0a22d4177892..b3e89ae9548e 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.6"; + version = "4.5.7"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-tfDjl1l1vMWZsxFNEPK9jOrUN260/3k2kX6rVHPCZ0k="; + hash = "sha256-0cPb78CTxrCdDZAY8hyt7Kid5DKszDl1v+6XNKyNrLM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 5152f5d0e33c..d172d75e011b 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.45.1"; + version = "3.45.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-zZwnhBt6WTLJiXZR4guGxwHddAVWmJsByllvz6PUmgo="; + hash = "sha256-vJBnRC7t8905mJtcXPv/83rmbMnJknTgwwUtxNSo9q4="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 695d2207da7d..94ac07df9d40 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.45.1"; + version = "3.45.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-f3sUpo7bzUpX3zqMTb1W0tNUam583VDeQM6wOvM9NLo="; + hash = "sha256-SkWjV3zIr2g8S9TG6Bp8eCxbfV2qBhdeosuXHKcWkbE="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/stduuid/default.nix b/nixpkgs/pkgs/development/libraries/stduuid/default.nix deleted file mode 100644 index c7e31c990087..000000000000 --- a/nixpkgs/pkgs/development/libraries/stduuid/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, cmake, fetchFromGitHub, lib }: let - version = "1.2.3"; -in stdenv.mkDerivation { - name = "stduuid-${version}"; - - src = fetchFromGitHub { - owner = "mariusbancila"; - repo = "stduuid"; - rev = "v${version}"; - hash = "sha256-MhpKv+gH3QxiaQMx5ImiQjDGrbKUFaaoBLj5Voh78vg="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "A C++17 cross-platform implementation for UUIDs"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.shlevy ]; - homepage = "https://github.com/mariusbancila/stduuid"; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/structuresynth/default.nix b/nixpkgs/pkgs/development/libraries/structuresynth/default.nix new file mode 100644 index 000000000000..362aaa7e25c9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/structuresynth/default.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + qtbase, + wrapQtAppsHook, + libGL, + libGLU, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "structuresynth"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "alemuntoni"; + repo = "structuresynth"; + rev = finalAttrs.version; + hash = "sha256-uFz4WPwA586B/5p+DUJ/W8KzbHLBhLIwP6mySZJ1vPY="; + }; + + patches = [ + # This PR in 2 commits allow packaging of this project as standalone. + # It was merged upstream, so those 2 patches can be removed on next release. + (fetchpatch { + name = "shared-lib.patch"; + url = "https://github.com/alemuntoni/StructureSynth/pull/1/commits/fdb87c55a03c6a0faa4335de5d29f0fb547b6102.patch"; + hash = "sha256-/66x8HGyNhGwoxsbV+QIRFYQNuFSHYXNYkJzAn4jyJI="; + }) + (fetchpatch { + name = "install-project.patch"; + url = "https://github.com/alemuntoni/StructureSynth/pull/1/commits/f96a90f6a4c60e9e0316edd20ea77674a2b764a7.patch"; + hash = "sha256-cSZAL1N2/Gd0x+9UkTUQxqVlb2m2MM8AA1Zzlo6S35w="; + }) + ]; + + outputs = [ + "dev" + "out" + ]; + + buildInputs = [ + libGL + libGLU + qtbase + ]; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + meta = with lib; { + description = "Generate 3D structures by specifying a design grammar"; + homepage = "https://github.com/alemuntoni/StructureSynth"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nim65s ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix index 5523ae429c26..c02a9ed49577 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "tbb"; - version = "2021.8.0"; + version = "2021.11.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "oneapi-src"; repo = "oneTBB"; rev = "v${version}"; - hash = "sha256-7MjUdPB1GsPt7ZkYj7DCisq20X8psljsVCjDpCSTYT4="; + hash = "sha256-zGZHMtAUVzBKFbCshpepm3ce3tW6wQ+F30kYYXAQ/TE="; }; nativeBuildInputs = [ @@ -28,27 +28,11 @@ stdenv.mkDerivation rec { url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch"; hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU="; }) - - # Fix/suppress warnings on gcc12.1 from https://github.com/oneapi-src/oneTBB/pull/866 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch"; - hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c="; - }) - - # Fix build with GCC 13 - (fetchpatch { - url = "https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch"; - hash = "sha256-BVQQXgBg8T19DGw2gmFkm3KKOuzzJJNOTf/iNIcnHag="; - }) - (fetchpatch { - url = "https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25.patch"; - hash = "sha256-IfV/DDb0luxE1l6TofAbQIeJEVxCxZfZqcONGwQEndY="; - }) ]; # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" ] ++ # error: variable 'val' set but not used lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index d6e3aa57e986..920b8467bc99 100644 --- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.24"; + version = "1.8.27"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "c5c55092dd61b9eb15d6bbfd0f02c04c593450e7"; - hash = "sha256-jqS3PGg42W15QBgpL1PNU3xJdk67g8u0THN/4hW5i88="; + rev = "efc6bd553b61dea0ae8c0436695e8d2539bf03f9"; + hash = "sha256-AHfuT+bLkc8Lm1B96E/kwUx1ZKStQbv/skH8woRITRk="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix deleted file mode 100644 index 5ceb76b9bf7f..000000000000 --- a/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, mesonEmulatorHook -, ninja -, gnome -, gobject-introspection -, gtk3 -, icu -, libgedit-amtk -, libgedit-gtksourceview -, pkg-config -, gtk-doc -, docbook-xsl-nons -}: - -stdenv.mkDerivation rec { - pname = "tepl"; - version = "6.8.0"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Rubl8b/bxS5ZVvBq3VdenHaXxnPVPTgD3+do9JC1YPA="; - }; - - strictDeps = true; - nativeBuildInputs = [ - meson - ninja - gobject-introspection - pkg-config - gtk-doc - docbook-xsl-nons - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - icu - ]; - - propagatedBuildInputs = [ - gtk3 - libgedit-amtk - libgedit-gtksourceview - ]; - - doCheck = false; - # TODO: one test fails because of - # (./test-file-metadata:20931): Tepl-WARNING **: 14:41:36.942: GVfs metadata - # is not supported. Fallback to TeplMetadataManager. Either GVfs is not - # correctly installed or GVfs metadata are not supported on this platform. In - # the latter case, you should configure Tepl with --disable-gvfs-metadata. - - passthru.updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Tepl"; - description = "Text editor product line"; - maintainers = with maintainers; [ manveru bobby285271 ]; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/the-foundation/default.nix b/nixpkgs/pkgs/development/libraries/the-foundation/default.nix index 9b0fe4de9e44..d3021995ff8f 100644 --- a/nixpkgs/pkgs/development/libraries/the-foundation/default.nix +++ b/nixpkgs/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-6bEd8KzOfBse5sQ2zp+cZtEAu8xIl3GqrpxSZ7h/edI="; + hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/tllist/default.nix b/nixpkgs/pkgs/development/libraries/tllist/default.nix index e5cdad0aae63..62bcbf0241f3 100644 --- a/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://codeberg.org/dnkl/tllist"; - changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${version}"; + changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${finalAttrs.version}"; description = "C header file only implementation of a typed linked list"; longDescription = '' Most C implementations of linked list are untyped. That is, their data diff --git a/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix index 871b724029c8..6598da9a6f82 100644 --- a/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Videos"; + homepage = "https://gitlab.gnome.org/GNOME/totem-pl-parser"; description = "Simple GObject-based library to parse and save a host of playlist formats"; maintainers = teams.gnome.members; license = licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 3abd9bd24ba4..6d9d1628e4e7 100644 --- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Tracker"; + homepage = "https://gitlab.gnome.org/GNOME/tracker-miners"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index 45c5eb10152c..48fc561ddd13 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Tracker"; + homepage = "https://tracker.gnome.org/"; description = "Desktop-neutral user information store, search tool and indexer"; mainProgram = "tracker3"; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/ucc/default.nix b/nixpkgs/pkgs/development/libraries/ucc/default.nix index 09e10565bb2e..58dc82e3cb7b 100644 --- a/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ucc"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucc"; rev = "v${version}"; - sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs="; + sha256 = "sha256-xcJLYktkxNK2ewWRgm8zH/dMaIoI+9JexuswXi7MpAU="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix index 8e0772479ccb..71a1b2a2001f 100644 --- a/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl , rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config , config +, autoAddDriverRunpath , enableCuda ? config.cudaSupport , cudaPackages , enableRocm ? config.rocmSupport @@ -18,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY="; + sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ="; }; outputs = [ "out" "doc" "dev" ]; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 9c3026b0c9fb..2d543f5a5364 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.17.18"; + version = "0.18.1"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-RmrT4McV5W9Q6mqWUWWCPQc6hBN6y4oeObZlc2SKmF8="; + hash = "sha256-ZRtoaQM7sUiBNu1zxY6SRfWwGFYmHhzqBBAwuD+x7Xw="; }; patches = [ @@ -43,12 +43,6 @@ stdenv.mkDerivation (finalAttrs: { src = ./substitute-udevadm.patch; udevadm = "${systemdMinimal}/bin/udevadm"; }) - - (fetchpatch { - name = "musl.patch"; - url = "https://github.com/martinpitt/umockdev/commit/d4efe24be59bd859b87473ea3d7efe8100bedc74.patch"; - hash = "sha256-whf3p2e7FWN1xk5+HF9KsbMW74DPOQ0R0+FxBfCZTX0="; - }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix index 37cc66834462..0eb3bda4286d 100644 --- a/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} - ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + ${lib.optionalString stdenv.isDarwin '' substituteInPlace build/config/compiler/BUILD.gn \ --replace "-Wl,-fatal_warnings" "" ''} @@ -143,7 +143,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' ++ lib.optional stdenv.isDarwin ''use_lld=false''; - env.NIX_CFLAGS_COMPILE = "-O2"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-O2" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=enum-constexpr-conversion" + ]); FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index a20f26157ffc..5a28ad382236 100644 --- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, python3 -, libGLU, libepoxy, libX11, libdrm, mesa, gitUpdater +, libGLU, libepoxy, libX11, libdrm, mesa +, vaapiSupport ? true, libva +, gitUpdater }: stdenv.mkDerivation rec { @@ -13,10 +15,15 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; + buildInputs = [ libGLU libepoxy libX11 libdrm mesa ] + ++ lib.optionals vaapiSupport [ libva ]; nativeBuildInputs = [ meson ninja pkg-config python3 ]; + mesonFlags= [ + (lib.mesonBool "video" vaapiSupport) + ]; + passthru = { updateScript = gitUpdater { url = "https://gitlab.freedesktop.org/virgl/virglrenderer.git"; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index dc17404c8480..5793905a75a1 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.275.0"; + version = "1.3.280.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y="; + hash = "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4="; }; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 8b0f236acf4e..f36a01e1a67f 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-53PUXAWiK38ciV6oMvD7ZHdXi4RU4r0RmDWUUHU3mE0="; + hash = "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 301311e12412..c2c49671b078 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU="; + hash = "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/wangle/default.nix b/nixpkgs/pkgs/development/libraries/wangle/default.nix index d30389d97259..080bfb4d018c 100644 --- a/nixpkgs/pkgs/development/libraries/wangle/default.nix +++ b/nixpkgs/pkgs/development/libraries/wangle/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "wangle"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pXcJszncYWvtwT4guEl69rOAIXZzgF7I6qh8PqLbxdA="; + sha256 = "sha256-fDtJ+9bZj+siKlMglYMkLO/+jldUmsS5V3Umk1gNdlo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 9625f3a5ee1b..e150c87c15d1 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.33"; + version = "1.34"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo="; + hash = "sha256-xZsnys2F9guvTuX4DfXA0Vdg6taiQysAq34uBXTcr+s="; }; postPatch = lib.optionalString doCheck '' diff --git a/nixpkgs/pkgs/development/libraries/waylib/default.nix b/nixpkgs/pkgs/development/libraries/waylib/default.nix index 9aa211ffd3e0..d8522e1f64ff 100644 --- a/nixpkgs/pkgs/development/libraries/waylib/default.nix +++ b/nixpkgs/pkgs/development/libraries/waylib/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wayland-scanner @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3IdrChuXQyQGhJ/7kTqmkV0PyuSNP53Y0Po01Fc9Qi0="; }; + patches = [ + (fetchpatch { + name = "fix-build-on-qt-6_7.patch"; + url = "https://github.com/vioken/waylib/commit/09875ebedb074089ec57e71cbc8d8011f555be70.patch"; + hash = "sha256-ulXlLxn7TOlXSl4N5mjXCy3PJhxVeyDwbwKeV9J/FSI="; + }) + ]; + postPatch = '' substituteInPlace examples/tinywl/OutputDelegate.qml \ --replace "/usr/share/wallpapers/deepin/desktop.jpg" \ diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 07fc616efacc..140c2a4d4ae2 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPackages , runCommand , fetchurl , perl @@ -68,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.44.0"; + version = "2.44.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -79,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-xmUw5Bulmx7bpO6J7yCyGI4nO+0El+lQhHKePPvjDIc="; + hash = "sha256-QlsUWbDwTQYAx40au15+36PAYKQg+LIx6aai1dKcVWE="; }; patches = lib.optionals stdenv.isLinux [ @@ -113,8 +114,6 @@ stdenv.mkDerivation (finalAttrs: { gi-docgen glib # for gdbus-codegen unifdef - ] ++ lib.optionals stdenv.isLinux [ - wayland # for wayland-scanner ]; buildInputs = [ @@ -190,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" + "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" diff --git a/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix b/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix index 1543484868bf..49db133382b0 100644 --- a/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wfa2-lib"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "smarco"; repo = "WFA2-lib"; rev = "v${version}"; - hash = "sha256-h4e+f+JkQr3qqaBUDly24ZvKxaEGzeJtMXejh8aD5D0="; + hash = "sha256-vTeSvhSt3PQ/BID6uM1CuXkQipgG7VViDexvAwV4nW8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 61027c374c11..f62a4661a994 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -113,14 +112,6 @@ let in rec { - wlroots_0_15 = generic { - version = "0.15.1"; - hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; - extraBuildInputs = [ - ffmpeg_4 - ]; - }; - wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; @@ -134,11 +125,13 @@ rec { }; wlroots_0_17 = generic { - version = "0.17.2"; - hash = "sha256-Of9qykyVnBURc5A2pvCMm7sLbnuuG7OPWLxodQLN2Xg="; + version = "0.17.3"; + hash = "sha256-jth6BKci3sVDC86o+gSHKyDWnibVcNmipm7nn0S6LTg="; + extraNativeBuildInputs = [ + hwdata + ]; extraBuildInputs = [ ffmpeg - hwdata libliftoff libdisplay-info ]; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix index 0a747c1e86a4..fa69879ae97e 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/wlroots/wlr-protocols"; license = licenses.mit; # See file headers platforms = platforms.linux; - maintainers = with maintainers; [ twitchyliquid64 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index d84c3ec1956d..447e2fa879bf 100644 --- a/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.9"; + version = "4.9.10"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-YvQEAqiXwooCxUIZbIYhccbpVjYeFIp6d3dLeUP1RpE="; + hash = "sha256-L7GpDAqx7hF/PBLy6h10pAydpjaJU3JFgTZ2bJhZtG0="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 5bba7315f5cc..3094f253a01a 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -109,6 +109,8 @@ stdenv.mkDerivation rec { "--disable-monolithic" "--enable-mediactrl" "--with-nanosvg" + "--disable-rpath" + "--enable-repro-build" (if compat28 then "--enable-compat28" else "--disable-compat28") (if compat30 then "--enable-compat30" else "--disable-compat30") ] ++ lib.optional unicode "--enable-unicode" diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index f857b2a0b89e..91e8a435db80 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -1,40 +1,29 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , nasm , enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "x264"; - version = "unstable-2021-06-13"; + version = "0-unstable-2023-10-01"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; - rev = "5db6aa6cab1b146e07b60cc1736a01f21da01154"; - sha256 = "0swyrkz6nvajivxvrr08py0jrfcsjvpxw78xm1k5gd9xbdrxvknh"; + rev = "31e19f92f00c7003fa115047ce50978bc98c3a0d"; + hash = "sha256-7/FaaDFmoVhg82BIhP3RbFq4iKGNnhviOPxl3/8PWCM="; }; - # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix - # is put in the cc wrapper anyway. patches = [ + # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix + # is put in the cc wrapper anyway. ./disable-arm-neon-default.patch - (fetchpatch { - # https://code.videolan.org/videolan/x264/-/merge_requests/114 - name = "fix-parallelism.patch"; - url = "https://code.videolan.org/videolan/x264/-/commit/e067ab0b530395f90b578f6d05ab0a225e2efdf9.patch"; - hash = "sha256-16h2IUCRjYlKI2RXYq8QyXukAdfoQxyBKsK/nI6vhRI="; - }) ]; - postPatch = '' - patchShebangs . - '' - # Darwin uses `llvm-strip`, which results in a crash at runtime in assembly-based routines when `-x` is specified. - + lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile --replace '$(if $(STRIP), $(STRIP) -x $@)' '$(if $(STRIP), $(STRIP) -S $@)' ''; @@ -53,6 +42,12 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; + makeFlags = [ + "BASHCOMPLETIONSDIR=$(out)/share/bash-completion/completions" + "install-bashcompletion" + "install-lib-shared" + ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isx86 nasm; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix b/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix index 0483d2718541..1286b5e2157c 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.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-trfKWCMIuYV0XyCcIsNP8LCTc0MYotXvslRvp76YnKU="; + hash = "sha256-ANU3suG62G0M5ZUWaNcwD4ot/EYSK7236zGVQZIjjuE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 11f598b6544b..966109fa0086 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -14,6 +14,7 @@ , xdg-desktop-portal , wayland , gnome +, libjxl , librsvg , webp-pixbuf-loader }: @@ -50,10 +51,11 @@ stdenv.mkDerivation rec { ]; postInstall = '' - # Pull in WebP support for gnome-backgrounds. + # Pull in WebP and JXL support for gnome-backgrounds. # In postInstall to run before gappsWrapperArgsHook. export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { extraLoaders = [ + libjxl librsvg webp-pixbuf-loader ]; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 325fc7305ad6..626c40f3bb33 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; - version = "1.18.2"; + version = "1.18.4"; outputs = [ "out" "installedTests" ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "flatpak"; repo = "xdg-desktop-portal"; rev = finalAttrs.version; - hash = "sha256-Pd5IKrVp/OOE10Ozy4R3XbubVc6iz0znG+YB0Uu+68E="; + hash = "sha256-o+aO7uGewDPrtgOgmp/CE2uiqiBLyo07pVCFrtlORFQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/xed/default.nix b/nixpkgs/pkgs/development/libraries/xed/default.nix index dc6495d0cf38..1fb634a80b90 100644 --- a/nixpkgs/pkgs/development/libraries/xed/default.nix +++ b/nixpkgs/pkgs/development/libraries/xed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages, llvmPackages }: let # mbuild is a custom build system used only to build xed @@ -10,34 +10,37 @@ let owner = "intelxed"; repo = "mbuild"; rev = "v${version}"; - sha256 = "sha256-eOAqmoPotdXGcBmrD9prXph4XOL6noJU6GYT/ud/VXk="; + sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU="; }; }; in stdenv.mkDerivation rec { pname = "xed"; - version = "2022.08.11"; + version = "2024.02.22"; src = fetchFromGitHub { owner = "intelxed"; repo = "xed"; rev = "v${version}"; - sha256 = "sha256-Iil+dfjuWYPbzmSjgwKTKScSE/IsWuHEKQ5HsBJDqWM="; + sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4="; }; - nativeBuildInputs = [ mbuild ]; + nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools ]; buildPhase = '' patchShebangs mfile.py # this will build, test and install ./mfile.py test --prefix $out + ./mfile.py examples + mkdir -p $out/bin + cp ./obj/wkit/examples/obj/xed $out/bin/ ''; dontInstall = true; # already installed during buildPhase meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.isAarch64; description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 67190d7cac76..0018a73341e3 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -5,6 +5,7 @@ , cmake , gtest , doCheck ? true +, autoAddDriverRunpath , cudaSupport ? config.cudaSupport , ncclSupport ? false , rLibrary ? false @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals cudaSupport [ cudaPackages.autoAddDriverRunpath ] + ++ lib.optionals cudaSupport [ autoAddDriverRunpath ] ++ lib.optionals rLibrary [ R ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit @@ -74,8 +75,8 @@ stdenv.mkDerivation rec { "-DUSE_CUDA=ON" # Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler. # https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145 - "-DCMAKE_C_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/gcc" - "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/g++" + "-DCMAKE_C_COMPILER=${cudaPackages.backendStdenv.cc}/bin/gcc" + "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/g++" ] ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") @@ -114,21 +115,15 @@ stdenv.mkDerivation rec { let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' runHook preInstall - mkdir -p $out - cp -r ../include $out - cp -r ../dmlc-core/include/dmlc $out/include - cp -r ../rabit/include/rabit $out/include - '' + lib.optionalString (!rLibrary) '' - install -Dm755 ../lib/${libname} $out/lib/${libname} - install -Dm755 ../xgboost $out/bin/xgboost '' # the R library option builds a completely different binary xgboost.so instead of # libxgboost.so, which isn't full featured for python and CLI + lib.optionalString rLibrary '' - mkdir $out/library + mkdir -p $out/library export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" - make install -l $out/library '' + '' + cmake --install . + cp -r ../rabit/include/rabit $out/include runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/libraries/yyjson/default.nix b/nixpkgs/pkgs/development/libraries/yyjson/default.nix index 86a286ef2e2d..82d4e1322f20 100644 --- a/nixpkgs/pkgs/development/libraries/yyjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/yyjson/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yyjson"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; rev = finalAttrs.version; - hash = "sha256-uAh/AUUDudQr+1+3YLkg9KxARgvKWxfDZlqo8388nFY="; + hash = "sha256-iRMjiaVnsTclcdzHjlFOTmJvX3VP4omJLC8AWA/EOZk="; }; nativeBuildInputs = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; }; }) diff --git a/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix index e90df0888a0d..c40cf9594cfa 100644 --- a/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -13,36 +13,15 @@ stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.72"; + version = "0.13.74"; src = fetchFromGitHub { owner = "gdraheim"; repo = pname; rev = "v${version}"; - hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q="; + hash = "sha256-MjqGHzb+dsAq2PrcBhU3sv4eMX3afkgFWUbhDp+5o/s="; }; - patches = [ - # apply https://github.com/gdraheim/zziplib/pull/113 - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff"; - sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y"; - }) - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff"; - sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny"; - }) - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; - sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; - }) - # Fixes invalid pointer conversions that cause compilation to fail with clang 15+ - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/38e4d5f561318fa825e6544c2ef55ac5899c81b0.diff"; - sha256 = "sha256-VJuFyiPhuAZlDxmNHBty+JbYwG85ea5u2sv7HZRHMwo="; - }) - ]; - nativeBuildInputs = [ cmake perl |