diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
199 files changed, 1510 insertions, 2249 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix index e82220b2398e..fa816c0add0f 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -31,9 +31,6 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; - # make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'. Stop. - postPatch = "patchShebangs ./configure"; - outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index dea308d59a2e..2532bab798bc 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.28.4"; + version = "2.28.5"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; + hash = "sha256-YcM7bfLo+KkWx8LdtG4z2UwJvzlEkvIkm+M5aMSztwU="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch b/nixpkgs/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch deleted file mode 100644 index c18420711b90..000000000000 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 1a80b5b..1fa57a7 100644 ---- a/CMake/AbseilHelpers.cmake -+++ b/CMake/AbseilHelpers.cmake -@@ -171,8 +171,8 @@ function(absl_cc_library) - FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" CONTENT "\ - prefix=${CMAKE_INSTALL_PREFIX}\n\ - exec_prefix=\${prefix}\n\ --libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}\n\ --includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}\n\ -+libdir=${CMAKE_INSTALL_FULL_LIBDIR}\n\ -+includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}\n\ - \n\ - Name: absl_${_NAME}\n\ - Description: Abseil ${_NAME} library\n\ diff --git a/nixpkgs/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch b/nixpkgs/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch deleted file mode 100644 index bbc10fabb268..000000000000 --- a/nixpkgs/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- apr-1.5.1/file_io/unix/filestat.c 2014-11-01 06:42:50.000000000 -0400 -+++ apr-1.5.1/file_io/unix/filestat.c.new 2014-11-01 07:07:32.000000000 -0400 -@@ -297,9 +297,11 @@ - finfo->pool = pool; - finfo->fname = fname; - fill_out_finfo(finfo, &info, wanted); -- if (wanted & APR_FINFO_LINK) -- wanted &= ~APR_FINFO_LINK; -- return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS; -+ if (wanted & APR_FINFO_LINK) { -+ return ((wanted & ~APR_FINFO_LINK) & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS; -+ } else { -+ return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS; -+ } - } - else { - #if !defined(ENOENT) || !defined(ENOTDIR) diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index a0869edf4fbd..9827e6f52a77 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.20"; + version = "0.24.22"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; + hash = "sha256-dvlJ0OWfyDNjQJtexeFcEEb7fdZYnTwbkgzsH9Kfn/M="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix b/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix index c2cdd5285aa3..cbb580413c2b 100644 --- a/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.2.5"; + version = "0.3.0"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - hash = "sha256-vosw4H3YTTCXdDOnQQYRNZgufPo1BxUtfg6jutArzTI="; + hash = "sha256-tC0rjb3eDtEciUk0NmVye+N//Y/RFsi5d3kFS031y8I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch b/nixpkgs/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch deleted file mode 100644 index 58eaf5f490b1..000000000000 --- a/nixpkgs/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru a/RtMidi.cpp b/RtMidi.cpp ---- a/RtMidi.cpp 2021-12-23 16:46:33.000000000 -0500 -+++ b/RtMidi.cpp 2021-12-23 16:48:19.000000000 -0500 -@@ -39,6 +39,9 @@ - - #include "RtMidi.h" - #include <sstream> -+#if defined(__APPLE__) -+#include <TargetConditionals.h> -+#endif - - #if defined(__MACOSX_CORE__) - #if TARGET_OS_IPHONE diff --git a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix index 45dceb393457..26a55efd786a 100644 --- a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.14"; + version = "0.6.16"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-mYL69A24Ou3Zs4UOSZ/s1oUri0um3t5RQBNlXP+soeY="; + hash = "sha256-ccFXmRGD5T0FVTk7tCccdcm19dq3Sl7yLyCLsi3jIsQ="; }; strictDeps = true; @@ -43,13 +43,6 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; - postFixup = '' - # remove once updated to 0.6.15 or above - for f in $dev/lib/pkgconfig/*; do - echo "Requires: lv2 >= 1.18.4, serd-0 >= 0.30.10, sord-0 >= 0.16.10" >> "$f" - done - ''; - passthru = { updateScript = writeScript "update-sratom" '' #!/usr/bin/env nix-shell diff --git a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix index 9f5d8867a150..0fc0635747e5 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -17,6 +18,16 @@ stdenv.mkDerivation rec { hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; }; + patches = [ + # clang-16 support on Darwin: + # https://gitlab.com/drobilla/zix/-/issues/3 + (fetchpatch { + name = "darwin-sync.patch"; + url = "https://gitlab.com/drobilla/zix/-/commit/a6f804073de1f1e626464a9dd0a169fd3f69fdff.patch"; + hash = "sha256-ZkDPjtUzIyqnYarQR+7aCj7S/gSngbd6d75aRT+h7Ww="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -28,12 +39,7 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; - env = lib.optionalAttrs stdenv.isDarwin { - # Do not fail the build on clang-16/darwin. - # TODO: drop the workaround when upstream fixes it in: - # https://gitlab.com/drobilla/zix/-/issues/3 - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; + doCheck = true; meta = with lib; { description = "A lightweight C99 portability and data structure library"; diff --git a/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38469.patch b/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38469.patch new file mode 100644 index 000000000000..ff6cd65de0f4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38469.patch @@ -0,0 +1,102 @@ +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 new file mode 100644 index 000000000000..be0faddbfef5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch @@ -0,0 +1,47 @@ +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 772650bd3a8a..df3d113dfd2c 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -51,6 +51,41 @@ stdenv.mkDerivation rec { url = "https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f.patch"; sha256 = "sha256-BEYFGCnQngp+OpiKIY/oaKygX7isAnxJpUPCUvg+efc="; }) + # CVE-2023-38470 + # https://github.com/lathiat/avahi/pull/457 merged Sep 19 + (fetchpatch { + name = "CVE-2023-38470.patch"; + url = "https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c.patch"; + sha256 = "sha256-Fanh9bvz+uknr5pAmltqijuUAZIG39JR2Lyq5zGKJ58="; + }) + # CVE-2023-38473 + # https://github.com/lathiat/avahi/pull/486 merged Oct 18 + (fetchpatch { + name = "CVE-2023-38473.patch"; + url = "https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797.patch"; + sha256 = "sha256-/ZVhsBkf70vjDWWG5KXxvGXIpLOZUXdRkn3413iSlnI="; + }) + # CVE-2023-38472 + # https://github.com/lathiat/avahi/pull/490 merged Oct 19 + (fetchpatch { + name = "CVE-2023-38472.patch"; + url = "https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40.patch"; + sha256 = "sha256-FjR8fmhevgdxR9JQ5iBLFXK0ILp2OZQ8Oo9IKjefCqk="; + }) + # CVE-2023-38471 + # https://github.com/lathiat/avahi/pull/494 merged Oct 24 + (fetchpatch { + name = "CVE-2023-38471.patch"; + url = "https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09.patch"; + 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 + # 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 ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index e2b4aa880415..53b4e167a7d9 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -1,7 +1,7 @@ -{ callPackage, fetchpatch, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "2.19"; revision = "3"; - sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; + hash = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/3.0.nix b/nixpkgs/pkgs/development/libraries/botan/3.0.nix index a9b6a7aa27d3..4c0eae63493a 100644 --- a/nixpkgs/pkgs/development/libraries/botan/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,7 @@ -{ callPackage, fetchpatch, lib, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "3.2"; revision = "0"; - sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; - # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. - badPlatforms = lib.platforms.darwin; + hash = "sha256-BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 795cd5189efe..8e053581e88b 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost # Passed by version specific builders -, baseVersion, revision, sha256 +, baseVersion, revision, hash , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , extraPatches ? [ ] @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}" "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}" ]; - inherit sha256; + inherit hash; }; patches = extraPatches; inherit postPatch; diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index b8201f8ce5c6..60578f79ea57 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "1.19.1"; src = fetchurl { - url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; + url = "https://c-ares.org/download/${pname}-${version}.tar.gz"; sha256 = "sha256-MhcAOZty7Q4DfQB0xinndB9rLsLdqSlWq+PpZx0+Jo4="; }; diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 017b4cf46a79..8ac9da237d19 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -57,7 +57,7 @@ in { "-Dspectre=disabled" (lib.mesonEnable "glib" gobjectSupport) - (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "xlib" x11Support) (lib.mesonEnable "xcb" xcbSupport) ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ diff --git a/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch b/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch deleted file mode 100644 index 6deecf2a9717..000000000000 --- a/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch +++ /dev/null @@ -1,89 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6 - -Comment 6 Jeremy Huddleston Sequoia 2014-07-15 04:12:40 UTC - -Yes, it is still an issue. We just disable the buggy '"x$cairo_cc_stderr" != "x"' logic, but that's not really a portable solution for you: - -diff -Naurp cairo-1.12.2.orig/configure cairo-1.12.2/configure ---- cairo-1.12.2.orig/configure 2012-04-29 11:49:59.000000000 -0700 -+++ cairo-1.12.2/configure 2012-05-03 11:23:49.000000000 -0700 -@@ -18044,7 +18044,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -18091,7 +18091,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -18161,7 +18161,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -18217,7 +18217,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -19663,7 +19663,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -19710,7 +19710,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -32692,7 +32692,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -32811,7 +32811,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -32892,7 +32892,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi diff --git a/nixpkgs/pkgs/development/libraries/cctag/default.nix b/nixpkgs/pkgs/development/libraries/cctag/default.nix index 2c1a5f9ae786..238821b6af91 100644 --- a/nixpkgs/pkgs/development/libraries/cctag/default.nix +++ b/nixpkgs/pkgs/development/libraries/cctag/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost179 eigen - opencv + opencv.cxxdev ]; # Tests are broken on Darwin (linking issue) diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix deleted file mode 100644 index b6765af12a4c..000000000000 --- a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "clucene-core"; - version = "0.9.21b"; - - src = fetchurl { - url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.bz2"; - sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; - }; - - patches = [ ./gcc6.patch ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-std=c++11" - ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Core library for full-featured text search engine"; - longDescription = '' - CLucene is a high-performance, scalable, cross platform, full-featured, - open-source indexing and searching API. Specifically, CLucene is the guts - of a search engine, the hard stuff. You write the easy stuff: the UI and - the process of selecting and parsing your data files to pump them into - the search engine yourself, and any specialized queries to pull it back - for display or further processing. - - CLucene is a port of the very popular Java Lucene text search engine API. - ''; - homepage = "https://clucene.sourceforge.net"; - platforms = platforms.unix; - license = with licenses; [ asl20 lgpl2 ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/gcc6.patch b/nixpkgs/pkgs/development/libraries/clucene-core/gcc6.patch deleted file mode 100644 index f78b26d24f6a..000000000000 --- a/nixpkgs/pkgs/development/libraries/clucene-core/gcc6.patch +++ /dev/null @@ -1,146 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=998477 - -diff -up clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h ---- clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 2008-10-23 12:44:35.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h 2013-08-27 13:17:35.754234297 -0500 -@@ -58,7 +58,7 @@ public: - __cl_refcount--; - return __cl_refcount; - } -- virtual ~LuceneBase(){}; -+ virtual ~LuceneBase() throw(CLuceneError&) {}; - }; - - class LuceneVoidBase{ -diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp ---- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 2013-08-27 13:17:35.754234297 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp 2013-08-27 13:18:02.844949386 -0500 -@@ -94,7 +94,7 @@ CompoundFileReader::CompoundFileReader(D - ) - } - --CompoundFileReader::~CompoundFileReader(){ -+CompoundFileReader::~CompoundFileReader() throw(CLuceneError&) { - close(); - } - -diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h ---- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 2008-10-23 12:44:37.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h 2013-08-27 13:17:35.755234286 -0500 -@@ -95,7 +95,7 @@ protected: - - public: - CompoundFileReader(CL_NS(store)::Directory* dir, char* name); -- ~CompoundFileReader(); -+ ~CompoundFileReader() throw(CLuceneError&); - CL_NS(store)::Directory* getDirectory(); - const char* getName() const; - -diff -up clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.cpp ---- clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 2008-10-23 12:44:37.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/Term.cpp 2013-08-27 13:17:35.755234286 -0500 -@@ -81,7 +81,7 @@ Term::Term(const TCHAR* fld, const TCHAR - set(fld,txt); - } - --Term::~Term(){ -+Term::~Term() throw (CLuceneError&) { - //Func - Destructor. - //Pre - true - //Post - The instance has been destroyed. field and text have been deleted if pre(intrn) is false -diff -up clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.h ---- clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 2008-10-23 12:44:37.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/Term.h 2013-08-27 13:17:35.755234286 -0500 -@@ -68,7 +68,7 @@ class Term:LUCENE_REFBASE { - Term(const TCHAR* fld, const TCHAR* txt); - - ///Destructor. -- ~Term(); -+ ~Term() throw(CLuceneError&); - - ///Returns the field of this term, an interned string. The field indicates - ///the part of a document which this term came from. -diff -up clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/Directory.h ---- clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/Directory.h 2013-08-27 13:17:35.756234276 -0500 -@@ -41,7 +41,7 @@ CL_NS_DEF(store) - public: - DEFINE_MUTEX(THIS_LOCK) - -- virtual ~Directory(){ }; -+ virtual ~Directory() throw(CLuceneError&) { }; - - // Returns an null terminated array of strings, one for each file in the directory. - char** list() const{ -diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp ---- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 2008-10-23 13:01:52.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp 2013-08-27 13:17:35.756234276 -0500 -@@ -368,7 +368,7 @@ void FSDirectory::FSIndexInput::readInte - strcat(buffer,name); - } - -- FSDirectory::~FSDirectory(){ -+ FSDirectory::~FSDirectory() throw(CLuceneError&) { - } - - void FSDirectory::list(vector<string>* names) const{ //todo: fix this, ugly!!! -diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h ---- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 2008-10-23 13:00:43.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h 2013-08-27 13:17:35.756234276 -0500 -@@ -155,7 +155,7 @@ - ///Destructor - only call this if you are sure the directory - ///is not being used anymore. Otherwise use the ref-counting - ///facilities of _CLDECDELETE -- ~FSDirectory(); -+ ~FSDirectory() throw(CLuceneError&); - - /// Get a list of strings, one for each file in the directory. - void list(vector<string>* names) const; -diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp ---- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500 -@@ -219,7 +219,7 @@ CL_NS_DEF(store) - { - } - -- RAMDirectory::~RAMDirectory(){ -+ RAMDirectory::~RAMDirectory() throw(CLuceneError&) { - //todo: should call close directory? - } - -diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h ---- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h 2013-08-27 13:17:35.757234265 -0500 -@@ -131,7 +131,7 @@ CL_NS_DEF(store) - ///Destructor - only call this if you are sure the directory - ///is not being used anymore. Otherwise use the ref-counting - ///facilities of dir->close -- virtual ~RAMDirectory(); -+ virtual ~RAMDirectory() throw(CLuceneError&); - RAMDirectory(Directory* dir); - - /** -diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp ---- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500 -@@ -16,7 +16,7 @@ CL_NS_USE(util) - { - transOpen = false; - } -- TransactionalRAMDirectory::~TransactionalRAMDirectory(){ -+ TransactionalRAMDirectory::~TransactionalRAMDirectory() throw(CLuceneError&) { - } - - bool TransactionalRAMDirectory::archiveOrigFileIfNecessary(const char* name) { -diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h ---- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h 2013-08-27 13:17:35.757234265 -0500 -@@ -44,7 +44,7 @@ CL_NS_DEF(store) - - public: - TransactionalRAMDirectory(); -- virtual ~TransactionalRAMDirectory(); -+ virtual ~TransactionalRAMDirectory() throw(CLuceneError&); - - bool transIsOpen() const; - void transStart(); diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index b15335a37ca4..b76153304dfa 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.2"; + version = "5.24.4"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-boV0OO8GzgH0HpNh00nYLM2+wCmvuDxwKHvCMCdmiJs="; + sha256 = "sha256-YQNnf/DAtc58OwOWa2SBijIDpuhqWxFZHZCXLJ8PstI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix index 8a8caa556c87..5030a185886d 100644 --- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.8.0"; + version = "8.9.0"; underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - hash = "sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU="; + hash = "sha256-HV+afSFkiXdy840JbHBTR8lLL0GMwsN3QdwaoQmicpQ="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index 58906b608231..324a11a6c7a2 100644 --- a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withMkl [ mkl ] ++ lib.optionals withCUDA [ + cudaPackages.cuda_cccl # <nv/target> required by the fp16 headers in cudart cudaPackages.cuda_cudart cudaPackages.libcublas cudaPackages.libcurand diff --git a/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/nixpkgs/pkgs/development/libraries/dqlite/default.nix index 1bf86800df89..ff379c1a78b3 100644 --- a/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/dsdcc/default.nix b/nixpkgs/pkgs/development/libraries/dsdcc/default.nix index e97b36c033ff..9397c747e667 100644 --- a/nixpkgs/pkgs/development/libraries/dsdcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/dsdcc/default.nix @@ -1,20 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mbelib, serialdv +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mbelib +, serialdv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsdcc"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "dsdcc"; - rev = "v${version}"; - sha256 = "sha256-EsjmU0LQOXnOoTFrnn63hAbvqbE6NVlSQTngot5Zuf4="; + rev = "v${finalAttrs.version}"; + hash = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mbelib serialdv ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mbelib + serialdv + ]; cmakeFlags = [ "-DUSE_MBELIB=ON" @@ -25,11 +37,12 @@ stdenv.mkDerivation rec { --replace '=''${exec_prefix}//' '=/' ''; - meta = with lib; { + meta = { description = "Digital Speech Decoder (DSD) rewritten as a C++ library"; homepage = "https://github.com/f4exb/dsdcc"; - license = licenses.gpl3; - maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + mainProgram = "dsdccx"; + maintainers = with lib.maintainers; [ alexwinter ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/epoll-shim/default.nix b/nixpkgs/pkgs/development/libraries/epoll-shim/default.nix index ae2c22afd633..d303f814b271 100644 --- a/nixpkgs/pkgs/development/libraries/epoll-shim/default.nix +++ b/nixpkgs/pkgs/development/libraries/epoll-shim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_PKGCONFIGDIR=${placeholder "out"}/lib/pkgconfig" - "-DBUILD_TESTING=${lib.boolToString finalAttrs.doCheck}" + "-DBUILD_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; # https://github.com/jiixyj/epoll-shim/issues/41 diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix index ac6e9bfdc386..248e3774f4cd 100644 --- a/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; preCheck = '' - patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh + patchShebangs ./run.sh ./test-driver-wrapper.sh ''; # CMake files incorrectly calculate library path from dev prefix diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix index f72e6f4f9543..12179dd7e2a8 100644 --- a/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -1,8 +1,7 @@ {lib , stdenv , fetchFromGitHub -, autoreconfHook -, drmSupport ? false # Digital Radio Mondiale +, cmake # for passthru.tests , gst_all_1 @@ -13,19 +12,18 @@ stdenv.mkDerivation rec { pname = "faad2"; - version = "2.10.1"; + version = "2.11.1"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; rev = version; - sha256 = "sha256-k7y12OwCn3YkNZY9Ov5Y9EQtlrZh6oFUzM27JDR960w="; + hash = "sha256-E6oe7yjYy1SJo8xQkyUk1sSucKDMPxwUFVSAyrf4Pd8="; }; - configureFlags = [] - ++ lib.optional drmSupport "--with-drm"; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; passthru.tests = { inherit mpd vlc; diff --git a/nixpkgs/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix index 026c1f3ed063..7c06a346e4bb 100644 --- a/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , stdenv , lib , gfortran @@ -25,6 +26,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; + patches = [ + (fetchpatch { + name = "remove_missing_FFTW3LibraryDepends.patch"; + url = "https://github.com/FFTW/fftw3/pull/338/commits/f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7.patch"; + hash = "sha256-lzX9kAHDMY4A3Td8necXwYLcN6j8Wcegi3A7OIECKeU="; + }) + ]; + outputs = [ "out" "dev" "man" ] ++ lib.optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom @@ -64,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fastest Fourier Transform in the West library"; - homepage = "http://www.fftw.org/"; + homepage = "https://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ ]; pkgConfigModules = [ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 0c44b99db8d9..005890a3d4a6 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.4"; + version = "1.14.5"; # 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-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-W3DGTOesE04eoIARJW5COuXFTydyl0QVg/d9AT8n/6w="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch index da1475009009..ebbcbde5e951 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -63,7 +63,7 @@ index afa11a6b..5b12055f 100755 flatpak build-finish ${DIR} >&2 mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index 4ba950df..fd50fab3 100755 +index 6345ff58..fd50fab3 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh @@ -28,9 +28,10 @@ EOF @@ -78,7 +78,7 @@ index 4ba950df..fd50fab3 100755 mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then +@@ -40,46 +41,17 @@ if test -f /sbin/ldconfig.real; then else cp "$(type -P ldconfig)" "${DIR}/usr/bin" fi @@ -89,6 +89,12 @@ index 4ba950df..fd50fab3 100755 - local f=$1 - shift - +- # Check if the program is installed +- if ! command -v "${f}" &> /dev/null; then +- echo "${f} not found" +- exit 1 +- fi +- - if grep -qFe "${f}" $BINS; then - # Already handled - return 0 @@ -129,7 +135,7 @@ index 4ba950df..fd50fab3 100755 done ln -s bash ${DIR}/usr/bin/sh -@@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" +@@ -90,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" EOF chmod a+x ${DIR}/usr/bin/runtime_hello.sh diff --git a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch index fec0573ed950..2a88d24f4916 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8fa8c0e0..e1cdeba0 100644 +index 6f54a9d0..102d9b90 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = { - {"XKB_CONFIG_ROOT", NULL}, - {"GIO_EXTRA_MODULES", NULL}, +@@ -1902,6 +1902,7 @@ static const ExportData default_exports[] = { {"GDK_BACKEND", NULL}, + {"VK_DRIVER_FILES", NULL}, + {"VK_ICD_FILENAMES", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index 97c356a3aa4e..c30f69f18fdf 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.6"; + version = "1.4.8"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA="; + hash = "sha256-KzXaLxxmxUrE9uQD2zpKuYOhLpi4a7xMgiZxaf+Tq2k="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index 1687bf5c516b..68e08a1a8b5f 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl -, buildPackages, pkgsHostHost -, pkg-config, which, makeWrapper -, zlib, bzip2, brotli, libpng, gnumake, glib +{ lib +, stdenv +, fetchurl +, buildPackages +, pkgsHostHost +, pkg-config +, which +, makeWrapper +, zlib +, bzip2 +, brotli +, libpng +, gnumake +, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). # LCD filtering is also known as ClearType and covered by several Microsoft patents. # This option allows it to be disabled. See http://www.freetype.org/patents.html. useEncumberedCode ? true -# for passthru.tests + # for passthru.tests , cairo , fontforge , ghostscript @@ -65,9 +75,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = glib.flattenInclude # pkgsCross.mingwW64.pkg-config doesn't build # makeWrapper doesn't cross-compile to windows #120726 - + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' + + '' substituteInPlace $dev/bin/freetype-config \ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} + '' + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/nixpkgs/pkgs/development/libraries/g2o/default.nix b/nixpkgs/pkgs/development/libraries/g2o/default.nix index 1140565eefc7..cc4339da982a 100644 --- a/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -1,24 +1,26 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas -, lapack, libGLU, qtbase, libqglviewer, makeWrapper }: +, lapack, libGLU, qtbase, libqglviewer, spdlog }: mkDerivation rec { pname = "g2o"; - version = "20230223"; + version = "20230806"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "sha256-J2Z3oRkyiinIfywBQvnq1Q8Z5WuzQXOVTZTwN8oivf0="; + hash = "sha256-9u1FFRWe7qvDhzSKdGTduuGBXmmgzcSriGFb/oCJjNA="; }; # Removes a reference to gcc that is only used in a debug message patches = [ ./remove-compiler-reference.patch ]; + outputs = [ "out" "dev" ]; separateDebugInfo = true; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; + propagatedBuildInputs = [ spdlog ]; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 626c18352b03..5b30c5e1bf8d 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -239,6 +239,9 @@ stdenv.mkDerivation (finalAttrs: { # fixed and renamed in 3.8.0RC1 # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 "test_visoss_6" + # failing with PROJ 9.3.1 + # https://github.com/OSGeo/gdal/issues/8908 + "test_osr_esri_28" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index 3dac6d6804e3..cd20eab42a62 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.7.7"; + version = "2.8.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fm850eDqKhvjwU5RwdwAro4R23yRn41ePn5++8MXHZ0="; + sha256 = "sha256-SwY9FAUljaxap2ZlPS3JJ8VkYiJFWoSLU1miEQIEerE="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/geogram/default.nix b/nixpkgs/pkgs/development/libraries/geogram/default.nix index 1079f89d9328..619b5dfcdf57 100644 --- a/nixpkgs/pkgs/development/libraries/geogram/default.nix +++ b/nixpkgs/pkgs/development/libraries/geogram/default.nix @@ -13,17 +13,17 @@ let testdata = fetchFromGitHub { owner = "BrunoLevy"; repo = "geogram.data"; - rev = "8fd071a560bd6859508f1710981386d0b2ba01b1"; - hash = "sha256-jMUGX6/uYIZMVwXxTAAGUaOXqF+NrFQqgmIPCD58cwM="; + rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c"; + hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4="; }; in stdenv.mkDerivation rec { pname = "geogram"; - version = "1.8.3"; + version = "1.8.6"; src = fetchurl { url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz"; - hash = "sha256-91q0M/4kAr0UoWXOQIEYS1VbgEQ/F4EBOfJE9Vr1bnw="; + hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE="; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # See https://github.com/BrunoLevy/geogram/pull/76 - ./fix-cmake-install-destination.patch - # This patch replaces the bundled (outdated) zlib with our zlib # Should be harmless, but if there are issues this patch can also be removed # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress @@ -93,6 +90,9 @@ stdenv.mkDerivation rec { # Skip slow RVD test "RVD" + + # Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free) + "Delaunay" ]; in '' diff --git a/nixpkgs/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch b/nixpkgs/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch deleted file mode 100644 index 1dba488e8de3..000000000000 --- a/nixpkgs/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/cmake/utilities.cmake 1970-01-01 01:00:01.000000000 +0100 -+++ b/cmake/utilities.cmake 2023-03-09 19:28:16.556251981 +0100 -@@ -241,9 +241,9 @@ - install( - TARGETS ${ARGN} - COMPONENT runtime -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endfunction() - -@@ -270,9 +270,9 @@ - install( - TARGETS ${ARGN} - COMPONENT ${component} -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endforeach() - endfunction() ---- a/src/lib/geogram/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/lib/geogram/CMakeLists.txt 2023-03-09 20:29:12.346780432 +0100 -@@ -76,7 +76,7 @@ - # Install include files for the standard devkit - install( - DIRECTORY api -- DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram - COMPONENT devkit - FILES_MATCHING PATTERN *.h - ) -@@ -84,7 +84,7 @@ - # Install include files for the full devkit - install( - DIRECTORY . -- DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram - COMPONENT devkit-full - FILES_MATCHING PATTERN *.h - # Exclude all files related to licensing -@@ -93,7 +93,7 @@ - - install( - FILES "${PROJECT_BINARY_DIR}/geogram${VORPALINE_VERSION_MAJOR}.pc" -- DESTINATION lib${LIB_SUFFIX}/pkgconfig -+ DESTINATION ${GEOGRAM_INSTALL_PKGCONFIG_DIR} - ) - - ---- a/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/CMakeLists.txt 2023-03-09 20:40:20.075218356 +0100 -@@ -158,7 +158,7 @@ - - # FindGeogram.cmake - --install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) -+install(FILES cmake/FindGeogram.cmake DESTINATION ${GEOGRAM_INSTALL_CMAKE_DIR} COMPONENT devkit) - - # Configure CPack - ---- a/doc/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/doc/CMakeLists.txt 2023-03-09 21:12:04.386327003 +0100 -@@ -25,14 +25,14 @@ - - # Install documentation - if(GEOGRAM_WITH_VORPALINE) -- install(FILES README.txt DESTINATION doc COMPONENT runtime) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION doc COMPONENT runtime OPTIONAL) -+ install(FILES README.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime OPTIONAL) - endif() - -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION doc/geogram COMPONENT runtime OPTIONAL) -- -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION doc/devkit COMPONENT doc-devkit OPTIONAL) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION doc/devkit COMPONENT doc-devkit-full OPTIONAL) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION doc/devkit COMPONENT doc-devkit-internal OPTIONAL) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/geogram COMPONENT runtime OPTIONAL) -+ -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit OPTIONAL) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-full OPTIONAL) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-internal OPTIONAL) - - endif() diff --git a/nixpkgs/pkgs/development/libraries/geos/3.11.nix b/nixpkgs/pkgs/development/libraries/geos/3.11.nix new file mode 100644 index 000000000000..90bdfdb0d605 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/geos/3.11.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, callPackage +, fetchpatch +, fetchurl +, testers + +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geos"; + version = "3.11.2"; + + src = fetchurl { + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; + }; + + patches = [ + # Pull upstream fix of `gcc-13` build failure: + # https://github.com/libgeos/geos/pull/805 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; + hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; + }; + + meta = with lib; { + description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; + homepage = "https://libgeos.org"; + license = licenses.lgpl21Only; + maintainers = teams.geospatial.members; + pkgConfigModules = [ "geos" ]; + mainProgram = "geosop"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index 90bdfdb0d605..fc3cff98d7e8 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , callPackage -, fetchpatch , fetchurl , testers @@ -10,23 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.11.2"; + version = "3.12.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; + hash = "sha256-1up+SSIktRGT6CRP4+wXxNRNB3fzwyyk+xcRQFSaDQM="; }; - patches = [ - # Pull upstream fix of `gcc-13` build failure: - # https://github.com/libgeos/geos/pull/805 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; - hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; - }) - ]; - nativeBuildInputs = [ cmake ]; doCheck = true; @@ -40,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; homepage = "https://libgeos.org"; license = licenses.lgpl21Only; + mainProgram = "geosop"; maintainers = teams.geospatial.members; pkgConfigModules = [ "geos" ]; - mainProgram = "geosop"; + changelog = "https://github.com/libgeos/geos/releases/tag/${finalAttrs.finalPackage.version}"; }; }) diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 15c5e7d9ca58..4e01ca5c2b6e 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -19,21 +19,22 @@ stdenv.mkDerivation rec { # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) patches = lib.optional (!waylandSupport) ./x11.patch; - propagatedBuildInputs = [ (if stdenv.isDarwin then OpenGL else libGL) ]; + propagatedBuildInputs = + lib.optionals stdenv.isDarwin [ OpenGL ] + ++ lib.optionals stdenv.isLinux [ libGL ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames ++ lib.optional waylandSupport extra-cmake-modules; buildInputs = - if waylandSupport - then [ wayland wayland-protocols libxkbcommon ] - else [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]; + 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 ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ 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" @@ -50,6 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber twey ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index c11f6b8432bc..a2e4ad8f47cf 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; - preCheck = lib.optionalString finalAttrs.doCheck or config.doCheckByDefault or false '' + preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" diff --git a/nixpkgs/pkgs/development/libraries/glibc/rpcgen-path.patch b/nixpkgs/pkgs/development/libraries/glibc/rpcgen-path.patch deleted file mode 100644 index 3349449d9163..000000000000 --- a/nixpkgs/pkgs/development/libraries/glibc/rpcgen-path.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru glibc-2.18-orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c ---- glibc-2.18-orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc_main.c 2013-11-15 12:04:48.041006977 +0100 -@@ -78,7 +78,7 @@ - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = "/lib/cpp"; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -107,7 +107,6 @@ - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -322,25 +321,6 @@ - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat64 buf; -- -- if (stat64 (CPP, &buf) == 0) -- return; -- -- if (cppDefined) /* user specified cpp but it does not exist */ -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); -- crash (); -- } -- -- /* fall back to system CPP */ -- CPP = "cpp"; --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -359,7 +339,6 @@ - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 5f4a295e3b09..bbbdf19a1909 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autoconf, automake, libidn2, libiconv -, fetchpatch, texinfo +, texinfo , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , tpmSupport ? false, trousers, which, nettools, libunistring @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-uoueFa4gq6iPRGYZePW1hjSUMW/n5yLt6dBp/mKUgpw="; + hash = "sha256-52XlAW/6m53SQ+NjoEYNV3B0RE7iSRJn2y6WycKt73c="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -48,12 +48,6 @@ stdenv.mkDerivation rec { outputDoc = "devdoc"; patches = [ - (fetchpatch { #TODO: when updating drop this patch and texinfo - name = "GNUTLS_NO_EXTENSIONS.patch"; - url = "https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2.diff"; - hash = "sha256-3M5WdNoVx9gUwTUPgu/sXmsaNg+j5d6liXs0UZz8fGU="; - }) - ./nix-ssl-cert-file.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index daf3bad132d3..bcdd9274d091 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.59.1"; # N.B: if you change this, please update: + version = "1.60.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; + hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE="; fetchSubmodules = true; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilds = true; passthru.tests = { - inherit (python3.pkgs) grpcio-status grpcio-tools; + inherit (python3.pkgs) grpcio-status grpcio-tools jaxlib; inherit arrow-cpp; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 72c8b76e59f5..2874f0d2fa04 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tAKc0pCKCJxV8dkCpWXQB0lclbFELYOEhdxH+xLfcTc="; + hash = "sha256-xxb43/qPrD+2RpQa8cbscv/wWgRRMTEb8tBJ/ch7zi4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index d9b624a59943..e87555fef57b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-UPK00XwC7v5DC776jFzRNLG+eKU8D2DpURNtls9J/Us="; + hash = "sha256-YlGeDY+Wnr9iqaeZby0j792jMCF6Y19KMsC/HHFXdGg="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 96899b63e5b3..6a44f3e01a27 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-9QDmz93/VZCPk3cR/CaghA3iih6exJYhwLbxrb2PgY4="; + hash = "sha256-AeQsY1Kga9+kRW5ksGq32YxcSHolVXx2FVRjHL2mQhc="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 917a5041eeee..87097dddd8d3 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-iShWDvrxYTfDAoXnGHCOXQurB3frTvgSfgJ04SDT2Gs="; + hash = "sha256-FXz5P7J0HPDD3qcxvjry/65wPJ8s08DJGzgPvGheufk="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 93ddc619a573..764bd78c083a 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-dI1CNnLFl/h24TCAT7mEhI9bS4nv14pQbLF/dkZ5UwE="; + hash = "sha256-/sVqLDeiU80EjSiNTH7abv8ZECKwnbl14HosEF0bUh4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 8ff8220aa75d..7e4c7d77363d 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -43,6 +43,7 @@ , libgudev , wavpack , glib +, openssl # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: @@ -53,13 +54,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-s7B/4/HOf+k6qb5yF4ZgRFSPNcSneSKA7sfhCKMvmBc="; + hash = "sha256-ttsOGOOYtSZlt83OMBw0qHUEg9X0+6we3p+AsDdDzRU="; }; strictDeps = true; @@ -109,6 +110,7 @@ stdenv.mkDerivation rec { libintl ncurses wavpack + openssl ] ++ lib.optionals raspiCameraSupport [ libraspberrypi ] ++ lib.optionals enableX11 [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 7dbd9b61cbc3..c183f8ee48a2 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-d4nmQIOIol8jy/lIz8XGIw1zW7zYt/N/SgHJ40ih46c="; + hash = "sha256-FSW5FxQbiV/lz2GP6IZ2IrJSgnigKG6fcntfNzF9rKE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index aa211eb51a50..1420a438b6f6 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-CuM6i1BEO2LxFYGpGB6Qa0HNOHey15nb6nKRLD7aS7M="; + hash = "sha256-9/rAAeIK0h420YOXdBxGV8XUNXHrHMO0n5qTrhJ9yI8="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index cf5f93707cca..b92bb9dc0d4c 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-PjFFTJjLL39tLTVezrkzqJL6Dx3Am8NsmryTDY4pykg="; + hash = "sha256-UgtGvKY3GJrYaimP8kWy2JN128rIsF102uqRD4Gp6do="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index d2227763f4e8..b779d132210d 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2bovwmvvmMeOmCxZn1hdRru2X+Ei2onC16tB9GilLHs="; + hash = "sha256-Dp//douJ3m0xizQUbk54HYK5oPQCXcVBssg0nHvLf2c="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/hnswlib/default.nix b/nixpkgs/pkgs/development/libraries/hnswlib/default.nix index 9033d9f5ff4d..cba73d569344 100644 --- a/nixpkgs/pkgs/development/libraries/hnswlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/hnswlib/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { # this is a header-only library, so we don't need to build it # we need `cmake` only to run tests - nativeBuildInputs = lib.optionals finalAttrs.doCheck [ + nativeBuildInputs = lib.optionals finalAttrs.finalPackage.doCheck [ cmake python ]; # we only want to run buildPhase when we run tests - dontBuild = !finalAttrs.doCheck; + dontBuild = !finalAttrs.finalPackage.doCheck; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/libraries/http-parser/build-shared.patch b/nixpkgs/pkgs/development/libraries/http-parser/build-shared.patch deleted file mode 100644 index 5922cdfb5848..000000000000 --- a/nixpkgs/pkgs/development/libraries/http-parser/build-shared.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur http-parser-2.1-orig/http_parser.gyp http-parser-2.1/http_parser.gyp ---- http-parser-2.1-orig/http_parser.gyp 2013-03-26 18:35:20.000000000 -0400 -+++ http-parser-2.1/http_parser.gyp 2013-05-23 16:47:49.280488341 -0400 -@@ -21,7 +21,7 @@ - }, - 'Release': { - 'defines': [ 'NDEBUG' ], -- 'cflags': [ '-Wall', '-Wextra', '-O3' ], -+ 'cflags': [ '-Wall', '-Wextra', '-O3', '-fPIC' ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': 0, # static release -@@ -50,7 +50,7 @@ - 'targets': [ - { - 'target_name': 'http_parser', -- 'type': 'static_library', -+ 'type': 'shared_library', - 'include_dirs': [ '.' ], - 'direct_dependent_settings': { - 'defines': [ 'HTTP_PARSER_STRICT=0' ], -@@ -73,7 +73,7 @@ - - { - 'target_name': 'http_parser_strict', -- 'type': 'static_library', -+ 'type': 'shared_library', - 'include_dirs': [ '.' ], - 'direct_dependent_settings': { - 'defines': [ 'HTTP_PARSER_STRICT=1' ], diff --git a/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/nixpkgs/pkgs/development/libraries/http-parser/default.nix index 327121dc6b1b..65ac1fe92c13 100644 --- a/nixpkgs/pkgs/development/libraries/http-parser/default.nix +++ b/nixpkgs/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "http-parser"; @@ -12,8 +15,9 @@ stdenv.mkDerivation rec { }; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + patches = [ - ./build-shared.patch + ./enable-static-shared.patch ] ++ lib.optionals stdenv.isAarch32 [ # https://github.com/nodejs/http-parser/pull/510 (fetchpatch { @@ -21,18 +25,43 @@ stdenv.mkDerivation rec { sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4="; }) ]; - makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - buildFlags = [ "library" ]; + + makeFlags = [ + "DESTDIR=" + "PREFIX=$(out)" + "BINEXT=${stdenv.hostPlatform.extensions.executable}" + "Platform=${lib.toLower stdenv.hostPlatform.uname.system}" + "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}" + "ENABLE_SHARED=${if enableShared then "1" else "0"}" + "ENABLE_STATIC=${if enableStatic then "1" else "0"}" + ] ++ lib.optionals enableShared [ + "SOEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ lib.optionals enableStatic [ + "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}" + ] ++ lib.optionals (enableShared && stdenv.hostPlatform.isWindows) [ + "SONAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT)" + "LIBNAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOREV).$(SOEXT)" + "LDFLAGS=-Wl,--out-implib=$(LIBNAME).a" + ]; + + buildFlags = lib.optional enableShared "library" + ++ lib.optional enableStatic "package"; + doCheck = true; checkTarget = "test"; enableParallelBuilding = true; + postInstall = lib.optionalString stdenv.hostPlatform.isWindows '' + install -D *.dll.a $out/lib + ln -sf libhttp_parser.${version}.dll.a $out/lib/libhttp_parser.dll.a + ''; + meta = with lib; { description = "An HTTP message parser written in C"; homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/http-parser/enable-static-shared.patch b/nixpkgs/pkgs/development/libraries/http-parser/enable-static-shared.patch new file mode 100644 index 000000000000..42f11d4c817f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/http-parser/enable-static-shared.patch @@ -0,0 +1,93 @@ +commit abcb3cca9452779e91380b7636f32745166af3de +Author: John Ericson <John.Ericson@Obsidian.Systems> +Date: Wed Nov 29 23:55:38 2023 -0500 + + Make build system: enable/disable shared/static support + + This allows building this package in static-lib-only distros. + +diff --git a/Makefile b/Makefile +index 5d21221..cbc7914 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,6 +18,9 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + # IN THE SOFTWARE. + ++ENABLE_SHARED ?= 1 ++ENABLE_STATIC ?= ++ + PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') + HELPER ?= + BINEXT ?= +@@ -25,6 +28,8 @@ SOLIBNAME = libhttp_parser + SOMAJOR = 2 + SOMINOR = 9 + SOREV = 4 ++AEXT = a ++STATICLIBNAME = $(SOLIBNAME).$(AEXT) + ifeq (darwin,$(PLATFORM)) + SOEXT ?= dylib + SONAME ?= $(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT) +@@ -109,11 +114,17 @@ test-valgrind: test_g + libhttp_parser.o: http_parser.c http_parser.h Makefile + $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o + +-library: libhttp_parser.o +- $(CC) $(LDFLAGS_LIB) -o $(LIBNAME) $< ++.PHONY: library ++library: $(LIBNAME) ++ ++$(LIBNAME): libhttp_parser.o ++ $(CC) $(LDFLAGS_LIB) -o $@ $< + +-package: http_parser.o +- $(AR) rcs libhttp_parser.a http_parser.o ++.PHONY: package ++package: $(STATICLIBNAME) ++ ++$(STATICLIBNAME): http_parser.o ++ $(AR) rcs $@ $< + + url_parser: http_parser.o contrib/url_parser.c + $(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o $@ +@@ -130,12 +141,30 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c + tags: http_parser.c http_parser.h test.c + ctags $^ + +-install: library ++.PHONY: install-headers ++install-headers: + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ ++.PHONY: install-library ++install-library: library + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) + ++.PHONY: install-package ++install-package: package ++ $(INSTALL) -D $(STATICLIBNAME) $(DESTDIR)$(LIBDIR)/$(STATICLIBNAME) ++ ++.PHONY: install ++install: install-headers ++ifeq ($(ENABLE_SHARED),1) ++install: install-library ++endif ++ifeq ($(ENABLE_STATIC),1) ++install: install-package ++endif ++ ++.PHONY: install-strip + install-strip: library + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h + $(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +@@ -147,6 +176,7 @@ uninstall: + rm $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) + rm $(DESTDIR)$(LIBDIR)/$(SONAME) + rm $(DESTDIR)$(LIBDIR)/$(LIBNAME) ++ rm $(DESTDIR)$(LIBDIR)/$(STATICLIBNAME) + + clean: + rm -f *.o *.a tags test test_fast test_g \ diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index 67048167d6bf..7dc11069e9a6 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.9.3"; + version = "2.10.0"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-XEBizlVvbTRR/Bd/+4ZzohIPgd9oNd6mohqQ+9//Dew="; + sha256 = "sha256-AwXdYMneL75lGf4qTo/cbT243ldKDKeBK5LoDAWuE5I="; }; configureFlags = [ @@ -22,12 +22,13 @@ stdenv.mkDerivation rec { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; buildInputs = [ expat ncurses ] ++ lib.optionals x11Support [ cairo libX11 ] ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optional enableCuda cudaPackages.cudatoolkit; + ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ]; # Since `libpci' appears in `hwloc.pc', it must be propagated. propagatedBuildInputs = lib.optional stdenv.isLinux pciutils; diff --git a/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix b/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix index 8a080c1d4a97..8787fd390efd 100644 --- a/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix @@ -7,42 +7,32 @@ , libjpeg , libGL , libX11 -, withTouchSupport ? false , libXi , libXext , Cocoa , Kernel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "irrlichtmt"; - version = "1.9.0mt10"; + version = "1.9.0mt13"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; - rev = version; - sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g="; + rev = finalAttrs.version; + hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY="; }; nativeBuildInputs = [ cmake ]; - # https://github.com/minetest/minetest/pull/10729 - postPatch = lib.optionalString (!withTouchSupport) '' - sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h - - # HACK: Fix mistake in build script - sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt - ''; - buildInputs = [ zlib libpng libjpeg libGL libX11 - ] ++ lib.optionals withTouchSupport [ libXi libXext ] ++ lib.optionals stdenv.isDarwin [ @@ -58,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ DeeUnderscore ]; description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++"; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index 08d0ffae8f9d..fdf01c195af5 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds -, openssl, openldap, libedit, keyutils, libverto +, openssl, openldap, libedit, keyutils, libverto, darwin # for passthru.tests , bind @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20.2"; + version = "1.21.2"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-fY1ofUKu01DCUly2mk/DqnkWlNpnYdzMHELC7neWtd0="; + hash = "sha256-lWCUGp2EPAJDpxsXp6xv4xx867W845g9t55Srn6FBJE="; }; outputs = [ "out" "dev" ]; @@ -58,6 +58,11 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) [ openldap libedit ] ++ lib.optionals withVerto [ libverto ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ + libs.xpc + frameworks.Kerberos + ]); + sourceRoot = "krb5-${version}/src"; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 30d3c0d81b55..826dc544a88f 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.7.0"; + version = "3.7.1"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; + hash = "sha256-v2SBiDE4zZe3LMrlo/tP9GzmG/PJZ42rKi1svKJR6ZA="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/development/libraries/libass/default.nix b/nixpkgs/pkgs/development/libraries/libass/default.nix index 3265fd7d093e..ad94f55ccb6d 100644 --- a/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -4,6 +4,7 @@ , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer , libiconv +, darwin }: assert fontconfigSupport -> fontconfig != null; @@ -29,7 +30,12 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fribidi harfbuzz ] ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreText + ]; meta = with lib; { description = "Portable ASS/SSA subtitle renderer"; diff --git a/nixpkgs/pkgs/development/libraries/libavif/default.nix b/nixpkgs/pkgs/development/libraries/libavif/default.nix index 27aaef546433..02e069a35290 100644 --- a/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE="; + sha256 = "sha256-Ku0UgVBba1tHBzHjx5yf9hRAtbmXf2n4gEdAaGr3qTY="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix index 98cf028a55e1..4206c46f1f53 100644 --- a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-DENABLE_LOMIRI_FEATURES=OFF" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix b/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix index bc998563a732..b188a9cfc38c 100644 --- a/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { (lib.enableFeature enableShared "shared") ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl; passthru = { updateScript = unstableGitUpdater { }; diff --git a/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch deleted file mode 100644 index d3dec2936c50..000000000000 --- a/nixpkgs/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5007bbd..f46de1a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ - ]) - - AS_IF([test "x$use_bdjava_jar" = "xyes"], [ -- -+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" - dnl check for ant - AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) - AS_IF([test "x$HAVE_ANT" = "xno"], [ -diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index 1cb1bfe..f3711c2 100644 ---- a/src/libbluray/bdj/bdj.c -+++ b/src/libbluray/bdj/bdj.c -@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() - # ifdef __FreeBSD__ - "/usr/local/share/java/" BDJ_JARFILE, - # else -+# ifdef JARDIR -+ JARDIR "/" BDJ_JARFILE, -+# endif - "/usr/share/java/" BDJ_JARFILE, - "/usr/share/libbluray/lib/" BDJ_JARFILE, - # endif diff --git a/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/nixpkgs/pkgs/development/libraries/libcbor/default.nix index efb17eeaf315..514ee36d02df 100644 --- a/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { cmocka # cmake expects cmocka module ]; - cmakeFlags = lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON" + cmakeFlags = lib.optional finalAttrs.finalPackage.doCheck "-DWITH_TESTS=ON" ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON"; # Tests are restricted while pkgsStatic.cmocka is broken. Tracked at: diff --git a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index 5271663a10b8..8614bc4fee05 100644 --- a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0="; + hash = "sha256-XtD46tEV6RU1xbQgGA/nP6zWMgnZkOffVPdl8t/hIiA="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index 9c1a10f9f5b1..de366da98b96 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -14,14 +14,14 @@ }: stdenv.mkDerivation (finalAttrs: rec { - version = "1.0.12"; + version = "1.0.14"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "refs/tags/v${version}"; - hash = "sha256-pl1r3n4T4FcJ4My/wCE54R2fmTdrlJOvgb2U0MZf1BI="; + hash = "sha256-aZRtF4wYWxi/6ORNu7yVxFFdkvJTvBwPinL5lC0Mlqg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock index 966dcb72535e..551b2d30e951 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -198,12 +198,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -228,7 +228,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d736a74edf6c327b53dd9c932eae834253470ac5f0c55770e7e133bcbf986362" dependencies = [ - "async-channel 2.1.0", + "async-channel 2.1.1", "base64 0.21.5", "bytes", "chrono", @@ -707,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstyle", "clap_lex", @@ -808,9 +808,9 @@ checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -818,9 +818,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1064,9 +1064,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "default-net" @@ -1087,11 +1087,11 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.131.7" +version = "1.131.9" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.1.0", + "async-channel 2.1.1", "async-imap", "async-native-tls", "async-smtp", @@ -1165,10 +1165,10 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", - "async-channel 2.1.0", + "async-channel 2.1.1", "axum", "base64 0.21.5", "deltachat", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.131.7" +version = "1.131.9" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", "deltachat", @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", "deltachat", @@ -1799,9 +1799,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" dependencies = [ "concurrent-queue", "parking", @@ -1810,11 +1810,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "pin-project-lite", ] @@ -2123,9 +2123,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "group" @@ -2176,9 +2176,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -2461,8 +2461,7 @@ dependencies = [ [[package]] name = "imap-proto" version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" +source = "git+https://github.com/djc/tokio-imap.git?rev=01ff256a7e42a9f7d2732706f8b71a16ce93427e#01ff256a7e42a9f7d2732706f8b71a16ce93427e" dependencies = [ "nom", ] @@ -2506,8 +2505,8 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" -version = "0.4.1" -source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" +version = "0.4.2" +source = "git+https://github.com/n0-computer/iroh?branch=maint-0.4#9881b7886235035a1124e4371f7a4cd59379e51b" dependencies = [ "abao", "anyhow", @@ -3068,9 +3067,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3109,9 +3108,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -3253,9 +3252,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pgp" @@ -3297,7 +3296,7 @@ dependencies = [ "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.3", + "rsa 0.9.5", "sha1", "sha2 0.10.8", "sha3", @@ -3989,9 +3988,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474" dependencies = [ "const-oid", "digest 0.10.7", @@ -4289,9 +4288,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -4316,9 +4315,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -5148,9 +5147,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" +checksum = "8a548b68faefac1ef83c3682cece0046b4f3efc943a067aacb4dfb99be299f60" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5158,9 +5157,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" +checksum = "2f205a929a19c5dd74f80c9f795c33b4416f7efef7d7b2772f0eff96bdd71c35" dependencies = [ "darling 0.13.4", "ident_case", @@ -5323,9 +5322,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5333,9 +5332,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -5360,9 +5359,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5370,9 +5369,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -5383,9 +5382,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" @@ -5679,18 +5678,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" dependencies = [ "proc-macro2", "quote", diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 11e34045c36f..0d7b96562104 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -25,19 +25,20 @@ let outputHashes = { "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; + "imap-proto-0.16.3" = "sha256-okIHA8MQ1K/tcKHZYGh83zom1ULGHZ/KGxgcwiE1+sE="; + "iroh-0.4.2" = "sha256-VXNMmj+AvlY/W2JRWMICoNOqpFEahsUDxypHRg185Ao="; "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; }; }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.131.7"; + version = "1.131.9"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc="; + hash = "sha256-xZai5RsrfT6bYzMpNdKncmDzBzcAcEtZZmh7f+3g5Hs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libdicom/default.nix b/nixpkgs/pkgs/development/libraries/libdicom/default.nix new file mode 100644 index 000000000000..cb4d68121ef5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdicom/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, uthash +, meson +, ninja +, pkg-config +, check +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libdicom"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "ImagingDataCommons"; + repo = "libdicom"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE="; + }; + + buildInputs = [ uthash ]; + + nativeBuildInputs = [ meson ninja pkg-config ] + ++ lib.optionals (finalAttrs.finalPackage.doCheck) [ check ]; + + mesonBuildType = "release"; + + mesonFlags = lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dtests=false" ]; + + doCheck = true; + + meta = with lib; { + description = "C library for reading DICOM files"; + homepage = "https://github.com/ImagingDataCommons/libdicom"; + license = licenses.mit; + maintainers = with maintainers; [ lromor ]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index 63a8522bd073..a7ead8f22747 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.117"; + version = "2.4.118"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; + hash = "sha256-p3e9hfK1/JxX+IbIIFgwBXgxfK/bx30Kdp1+mpVnq4g="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix index c36d882c0aeb..f0eb267b05b5 100644 --- a/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ b/nixpkgs/pkgs/development/libraries/libedit/default.nix @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # NROFF = "${groff}/bin/nroff"; + # GCC automatically include `stdc-predefs.h` while Clang does not do + # this by default. While Musl is ISO 10646 compliant, doesn't define + # __STDC_ISO_10646__. This definition is in `stdc-predefs.h` that's + # why libedit builds just fine with GCC and Musl. + # There is a DR to fix this issue with Clang which is not merged + # yet. + # https://reviews.llvm.org/D137043 + NIX_CFLAGS_COMPILE = lib.optional + (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) + "-D__STDC_ISO_10646__=201103L"; + patches = [ ./01-cygwin.patch ]; propagatedBuildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix index 5bfa335314fe..6394a35d782d 100644 --- a/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ + # Fix implicit function declarations (clang-16 build failure): + # https://github.com/libffi/libffi/pull/764 + ./fix-implicit-fun-decl.patch ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch b/nixpkgs/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch new file mode 100644 index 000000000000..c0bd32d4333c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch @@ -0,0 +1,46 @@ +https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4.patch + +From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <serge.guelton@telecom-bretagne.eu> +Date: Thu, 2 Feb 2023 14:46:29 +0000 +Subject: [PATCH] Forward declare open_temp_exec_file (#764) + +It's defined in closures.c and used in tramp.c. +Also declare it as an hidden symbol, as it should be. + +Co-authored-by: serge-sans-paille <sguelton@mozilla.com> +--- + include/ffi_common.h | 4 ++++ + src/tramp.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/ffi_common.h b/include/ffi_common.h +index 2bd31b03d..c53a79493 100644 +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +diff --git a/src/tramp.c b/src/tramp.c +index 7e005b054..5f19b557f 100644 +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,10 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++ ++#include <ffi.h> ++#include <ffi_common.h> ++ + #include <stdio.h> + #include <unistd.h> + #include <stdlib.h> diff --git a/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/nixpkgs/pkgs/development/libraries/libfido2/default.nix index c14c30c27335..b3c3cc450237 100644 --- a/nixpkgs/pkgs/development/libraries/libfido2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfido2/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.13.0"; + version = "1.14.0"; # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UdQ3J+KhxFRMf9DuR3hvRD458TiK2nNaUJrUrwokWco="; + sha256 = "sha256-NgF5LjIAMtQoACxMzoSZpMe4AzGQUaJaDJ8fE4/+5Fo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix index f5fbf21f94fd..95fcf7131103 100644 --- a/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation { "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion"; + }; + postInstall = lib.optionalString stdenv.isDarwin '' # No rules to install the mac app, so do it manually. mkdir -p $out/Applications diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 23e11f097054..28cee5c7dfd6 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , libgpg-error , enableCapabilities ? false, libcap @@ -16,21 +15,13 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - hash = "sha256-O5wCoAS2jCVq3ZlwHeALODrMzPNxd+DWxYKJZkzODAM="; + hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo="; }; - patches = lib.optionals (!stdenv.isLinux) [ # not everywhere to avoid rebuild for now - (fetchpatch { - name = "getrandom-conditionalize.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=d41177937cea4aa1e9042ebcd195a349c40e8071"; - hash = "sha256-CgQjNtC1qLe5LicIc8rESc6Z1u4fk7ErMUVcG/2G9gM="; - }) - ]; - outputs = [ "out" "dev" "info" ]; outputBin = "dev"; diff --git a/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/nixpkgs/pkgs/development/libraries/libgit2/default.nix index 085c4c79bdc9..d21dbcb7ac0a 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool" + # For ws2_32, refered to by a `*.pc` file + "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index 70fc7d2dbeef..26d54d26d66a 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.74"; + version = "1.0.75"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-+nIB516XUPjfI3fHru48sU/5PYL/w14/sMK/B8FLflI="; + sha256 = "sha256-YHK5gRXBIhZJTY7F8b7QIUnftCIgOHwXVM3D35M3DC4="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index b7ccb7085fb2..a7480d6ffb95 100644 --- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchFromGitLab +, fetchpatch , autoreconfHook, pkg-config, python3, addOpenGLRunpath , libX11, libXext, xorgproto }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; + patches = [ + # Enable 64-bit file APIs on 32-bit systems: + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests/288 + (fetchpatch { + name = "large-file.patch"; + url = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/956d2d3f531841cabfeddd940be4c48b00c226b4.patch"; + hash = "sha256-Y6YCzd/jZ1VZP9bFlHkHjzSwShXeA7iJWdyfxpgT2l0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; diff --git a/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix index 775bcf2f2a43..f360e29ec2f2 100644 --- a/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix @@ -15,9 +15,23 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + strictDeps = true; propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + configureFlags = [ + # not ideal to use -config scripts but it's not possible switch it to pkg-config + # binaries in dev have a for build shebang + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libksba/default.nix b/nixpkgs/pkgs/development/libraries/libksba/default.nix index 9b1716ecc6df..8f22ede81669 100644 --- a/nixpkgs/pkgs/development/libraries/libksba/default.nix +++ b/nixpkgs/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-u7Q/AyuRZNhseB/+QiE6g79PL+6RRV7fpGVFIbiwO2s="; + hash = "sha256-pWRijFdMmSh5mHU/mNdQur2RpOnbRR9GrRQEZu8qbRY="; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 86cf8dfb9e88..94acb13205b5 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.10"; + version = "23.11"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-duvlAuDzELVZ1d2Qcn2ar9X6uq7KNELzjmKd/AfaDSI="; + hash = "sha256-GX5U/MeePA1d9EqPWNxOAYvC+F0T+jvtVK89xW1ehT0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libnsl/default.nix b/nixpkgs/pkgs/development/libraries/libnsl/default.nix index 59e16071ce71..b199406918ab 100644 --- a/nixpkgs/pkgs/development/libraries/libnsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnsl/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libtirpc ]; diff --git a/nixpkgs/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch b/nixpkgs/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch new file mode 100644 index 000000000000..c391f77dda8b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +index 2593790..0b5983d 100644 +--- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h ++++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +@@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param + typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...); + static inline MsgSendSuperFn getMsgSendSuperFn() noexcept { return (MsgSendSuperFn) (void*) objc_msgSendSuper; } + +-#if ! JUCE_IOS ++#if JUCE_INTEL && ! JUCE_IOS + typedef double (*MsgSendFPRetFn) (id, SEL op, ...); + static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; } + #endif diff --git a/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix b/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix new file mode 100644 index 000000000000..e546dc7a5786 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, alsa-lib +, cmake +, doxygen +, libX11 +, libXcursor +, libXext +, libXft +, libXinerama +, libXrandr +, pkg-config +, zlib +, Accelerate +, AGL +, Cocoa +, Foundation +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libopenshot-audio"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "OpenShot"; + repo = "libopenshot-audio"; + rev = "v${finalAttrs.version}"; + hash = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw="; + }; + + patches = [ + # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24 + ./0001-undef-fpret-on-aarch64-darwin.patch + ]; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ (if stdenv.isDarwin then [ + Accelerate + AGL + Cocoa + Foundation + zlib + ] else [ + libX11 + libXcursor + libXext + libXft + libXinerama + libXrandr + ]); + + strictDeps = true; + + doCheck = true; + + meta = { + homepage = "http://openshot.org/"; + description = "High-quality sound editing library"; + longDescription = '' + OpenShot Audio Library (libopenshot-audio) is a program that allows the + high-quality editing and playback of audio, and is based on the amazing + JUCE library. + ''; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff b/nixpkgs/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff new file mode 100644 index 000000000000..e5055d3f3089 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff @@ -0,0 +1,12 @@ +diff -Naur source/src/CMakeLists.txt source-new/src/CMakeLists.txt +--- source/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/src/CMakeLists.txt 2023-11-30 09:39:45.442332463 -0300 +@@ -231,7 +231,7 @@ + target_compile_definitions(openshot PUBLIC USE_IMAGEMAGICK=1) + + # Link with ImageMagick library +- target_link_libraries(openshot PUBLIC ImageMagick::Magick++) ++ target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore) + + set(HAVE_IMAGEMAGICK TRUE CACHE BOOL "Building with ImageMagick support" FORCE) + mark_as_advanced(HAVE_IMAGEMAGICK) diff --git a/nixpkgs/pkgs/development/libraries/libopenshot/default.nix b/nixpkgs/pkgs/development/libraries/libopenshot/default.nix new file mode 100644 index 000000000000..4622dabb2983 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libopenshot/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, cmake +, cppzmq +, doxygen +, ffmpeg +, imagemagick +, jsoncpp +, libopenshot-audio +, llvmPackages +, pkg-config +, python3 +, qtbase +, qtmultimedia +, swig +, zeromq +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libopenshot"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "OpenShot"; + repo = "libopenshot"; + rev = "v${finalAttrs.version}"; + hash = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM="; + }; + + patches = lib.optionals stdenv.isDarwin [ + # Darwin requires both Magick++ and MagickCore for a successful linkage + ./0001-link-magickcore.diff + ]; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + swig + ]; + + buildInputs = [ + cppzmq + ffmpeg + imagemagick + jsoncpp + libopenshot-audio + python3 + qtbase + qtmultimedia + zeromq + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp + ]; + + strictDeps = true; + + dontWrapQtApps = true; + + doCheck = true; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_RUBY" false) + (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages) + ]; + + passthru = { + inherit libopenshot-audio; + }; + + meta = { + homepage = "http://openshot.org/"; + description = "Free, open-source video editor library"; + longDescription = '' + OpenShot Library (libopenshot) is an open-source project dedicated to + delivering high quality video editing, animation, and playback solutions + to the world. API currently supports C++, Python, and Ruby. + ''; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 87e3049c6c85..84623e7459fc 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY="; + hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix b/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix index 491b8583fc93..d9993947b553 100644 --- a/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { # Workaround for "error: expected unqualified-id before 'public'" on "**signals" sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Don't build tests when we're not running them sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix b/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix index 8ef8975a01af..fe6a3e041798 100644 --- a/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - postPatch = lib.optionalString (!finalAttrs.doCheck) '' + postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Don't build tests when we're not running them sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index aec9cfaaf91a..9a127fcd92ad 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.45.0"; + version = "2.54.2"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j"; + sha256 = "sha256-EbnIHnsUgsqN/SVv4m9H7K8gfwni+u82+M55QBstAGI="; }; buildInputs = [ @@ -42,22 +42,10 @@ stdenv.mkDerivation rec { ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; patches = [ - # fix build on aarch64-darwin - # https://github.com/IntelRealSense/librealsense/pull/9253 - (fetchpatch { - url = "https://github.com/IntelRealSense/librealsense/commit/beb4c44debc8336de991c983274cad841eb5c323.patch"; - sha256 = "05mxsd2pz3xrvywdqyxkwdvxx8hjfxzcgl51897avz4v2j89pyq8"; - }) - ./py_sitepackage_dir.patch ./py_pybind11_no_external_download.patch + ./install-presets.patch ]; - postPatch = '' - # https://github.com/IntelRealSense/librealsense/issues/11092 - # insert a "#include <iostream" at beginning of file - sed '1i\#include <iostream>' -i wrappers/python/pyrs_device.cpp - ''; - nativeBuildInputs = [ cmake ninja diff --git a/nixpkgs/pkgs/development/libraries/librealsense/install-presets.patch b/nixpkgs/pkgs/development/libraries/librealsense/install-presets.patch new file mode 100644 index 000000000000..347aa4345323 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/librealsense/install-presets.patch @@ -0,0 +1,13 @@ +diff --git a/tools/realsense-viewer/CMakeLists.txt b/tools/realsense-viewer/CMakeLists.txt +index 44be6278f..1a4531dff 100644 +--- a/tools/realsense-viewer/CMakeLists.txt ++++ b/tools/realsense-viewer/CMakeLists.txt +@@ -253,7 +253,7 @@ install( + ) + #https://cmake.org/cmake/help/latest/command/install.html + install(DIRECTORY presets/ +- DESTINATION $ENV{HOME}/Documents/librealsense2/presets ++ DESTINATION $ENV{out}/share/librealsense2/presets + FILES_MATCHING PATTERN "*.preset" + ) + endif() diff --git a/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch index 2b48edb62e37..c91945fa1523 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch +++ b/nixpkgs/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch @@ -1,39 +1,15 @@ -From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001 -From: "Robert T. McGibbon" <rmcgibbo@gmail.com> -Date: Mon, 10 May 2021 17:26:04 -0400 -Subject: [PATCH 1/1] V1 - ---- - wrappers/python/CMakeLists.txt | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt -index aa83e4c77..4ec92ccfa 100644 ---- a/wrappers/python/CMakeLists.txt -+++ b/wrappers/python/CMakeLists.txt -@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS) - endif() - - set(DEPENDENCIES realsense2) --# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen), --# we copy the external project declaration to the build folder and then execute it --configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt) --execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" --) --execute_process(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" --) +diff --git a/CMake/global_config.cmake b/CMake/global_config.cmake +index 350f7a268..2cf125c67 100644 +--- a/CMake/global_config.cmake ++++ b/CMake/global_config.cmake +@@ -69,7 +69,8 @@ macro(global_set_flags) --# Add pybind11 makefile --add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11" -- "${CMAKE_BINARY_DIR}/third-party/pybind11" -- EXCLUDE_FROM_ALL --) -+find_package(pybind11 REQUIRED) + if(BUILD_PYTHON_BINDINGS) + include(libusb_config) +- include(CMake/external_pybind11.cmake) ++ find_package(pybind11 REQUIRED) ++ set(PYTHON_INSTALL_DIR "${XXNIX_PYTHON_SITEPACKAGES}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") + endif() - set(PYBIND11_CPP_STANDARD -std=c++11) - # Force Pybind11 not to share pyrealsense2 resources with other pybind modules. --- -2.29.3 + if(CHECK_FOR_UPDATES) diff --git a/nixpkgs/pkgs/development/libraries/librealsense/py_sitepackage_dir.patch b/nixpkgs/pkgs/development/libraries/librealsense/py_sitepackage_dir.patch deleted file mode 100644 index 99b567a429ed..000000000000 --- a/nixpkgs/pkgs/development/libraries/librealsense/py_sitepackage_dir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/wrappers/python/CMakeLists.txt -+++ b/wrappers/python/CMakeLists.txt -@@ -10,11 +10,11 @@ - if (CMAKE_VERSION VERSION_LESS 3.12) - find_package(PythonInterp REQUIRED) - find_package(PythonLibs REQUIRED) -- set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") -+ set(PYTHON_INSTALL_DIR "${XXNIX_PYTHON_SITEPACKAGES}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") - set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") - else() - find_package(Python REQUIRED COMPONENTS Interpreter Development) -- set(PYTHON_INSTALL_DIR "${Python_SITEARCH}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") -+ set(PYTHON_INSTALL_DIR "${XXNIX_PYTHON_SITEPACKAGES}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") - set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") - endif() diff --git a/nixpkgs/pkgs/development/libraries/libressl/fix-build-with-glibc.patch b/nixpkgs/pkgs/development/libraries/libressl/fix-build-with-glibc.patch deleted file mode 100644 index db482bcb35da..000000000000 --- a/nixpkgs/pkgs/development/libraries/libressl/fix-build-with-glibc.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/tests/explicit_bzero.c b/tests/explicit_bzero.c -index 34c60baa8a..9c0e917829 100644 ---- a/tests/explicit_bzero.c -+++ b/tests/explicit_bzero.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $ */ -+/* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */ - /* - * Copyright (c) 2014 Google Inc. - * -@@ -18,6 +18,7 @@ - #include <assert.h> - #include <errno.h> - #include <signal.h> -+#include <stdlib.h> - #include <string.h> - #include <unistd.h> - -@@ -36,19 +37,33 @@ enum { - SECRETBYTES = SECRETCOUNT * sizeof(secret) - }; - --static char altstack[SIGSTKSZ + SECRETBYTES]; -+/* -+ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer -+ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ). -+ */ -+static char *altstack; -+#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES) - - static void - setup_stack(void) - { -+ altstack = calloc(1, ALTSTACK_SIZE); -+ ASSERT_NE(NULL, altstack); -+ - const stack_t sigstk = { - .ss_sp = altstack, -- .ss_size = sizeof(altstack), -+ .ss_size = ALTSTACK_SIZE - }; - - ASSERT_EQ(0, sigaltstack(&sigstk, NULL)); - } - -+static void -+cleanup_stack(void) -+{ -+ free(altstack); -+} -+ - static void - assert_on_stack(void) - { -@@ -129,7 +144,7 @@ test_without_bzero() - char buf[SECRETBYTES]; - assert_on_stack(); - populate_secret(buf, sizeof(buf)); -- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); -+ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); - ASSERT_NE(NULL, res); - return (res); - } -@@ -140,7 +155,7 @@ test_with_bzero() - char buf[SECRETBYTES]; - assert_on_stack(); - populate_secret(buf, sizeof(buf)); -- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); -+ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); - ASSERT_NE(NULL, res); - explicit_bzero(buf, sizeof(buf)); - return (res); -@@ -183,15 +198,17 @@ main() - * on the stack. This sanity checks that call_on_stack() and - * populate_secret() work as intended. - */ -- memset(altstack, 0, sizeof(altstack)); -+ memset(altstack, 0, ALTSTACK_SIZE); - call_on_stack(do_test_without_bzero); - - /* - * Now test with a call to explicit_bzero() and check that we - * *don't* find any instances of the secret data. - */ -- memset(altstack, 0, sizeof(altstack)); -+ memset(altstack, 0, ALTSTACK_SIZE); - call_on_stack(do_test_with_bzero); - -+ cleanup_stack(); -+ - return (0); - } diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix index 9ed8a3fd4c3f..5515901a1cf2 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "w9I7N9/W458uCfCRt3sVQfv6F8Twtr9cibrvcikIDhc="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config meson diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index 3afb588af1b1..c73cbaa55dc3 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-qdvuMjNR0Qm3ruB0qcuJyj57z4rY7e8YUfTPNZvVCEM="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config meson ninja ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix index b3a00d89a5d5..5ecd27f60078 100644 --- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook , testers }: stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; + hash = "sha256-AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o="; }; outputs = [ "out" "dev" ]; - patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; + patches = [ + # Drop -Ofast as it breaks floating point arithmetics in downstream + # users. + (fetchpatch { + name = "drop-Ofast.patch"; + url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; + hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; + }) + ] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; + + nativeBuildInputs = [ autoreconfHook ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 4b40eacaa031..8f06936b5959 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.26"; + version = "0.7.27"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk="; + sha256 = "sha256-kVExzCHfPU/o+C5TTAv1J9H7GmYwVWCsIpVkkts42js="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix index 16c98abf4417..e1f93c822471 100644 --- a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DSIDX_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DSIDX_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix index 1f768a2cb261..57ceb5b444df 100644 --- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { dontDisableStatic = withStatic; + # libusb-1.0.rc:11: fatal error: opening dependency file .deps/libusb-1.0.Tpo: No such file or directory + dontAddDisableDepTrack = stdenv.hostPlatform.isWindows; + configureFlags = lib.optional (!enableUdev) "--disable-udev" ++ lib.optional (withExamples) "--enable-examples-build"; diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index d8b7cbdab521..9381f370754c 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,13 +1,10 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoconf , automake , libtool , pkg-config -, ApplicationServices -, CoreServices , pkgsStatic # for passthru.tests @@ -21,28 +18,20 @@ , nodejs , ocamlPackages , python3 +, testers }: stdenv.mkDerivation (finalAttrs: { - version = "1.46.0"; + version = "1.47.0"; pname = "libuv"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; + hash = "sha256-J6qvq///A/tr+/vNRVCwCc80/VHKWQTYF6Mt1I+dBCU="; }; - patches = [ - # Disable io_uring close on selected kernels. Remove on next release - # https://github.com/libuv/libuv/pull/4141 - (fetchpatch { - url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; - hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; - }) - ]; - outputs = [ "out" "dev" ]; postPatch = let @@ -50,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent "tcp_connect_timeout" # tries to reach out to 8.8.8.8 "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces - "getaddrinfo_fail" "getaddrinfo_fail_sync" + "getaddrinfo_fail" "getaddrinfo_fail_sync" "tcp_connect6_link_local" "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" "metrics_pool_events" # times out sometimes @@ -86,12 +75,11 @@ stdenv.mkDerivation (finalAttrs: { "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; - in lib.optionalString (finalAttrs.doCheck) '' + in lib.optionalString (finalAttrs.finalPackage.doCheck) '' sed '/${tdRegexp}/d' -i test/test-list.h ''; nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh @@ -119,12 +107,14 @@ stdenv.mkDerivation (finalAttrs: { python-pyuv = python3.pkgs.pyuv; python-uvloop = python3.pkgs.uvloop; static = pkgsStatic.libuv; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; + pkgConfigModules = [ "libuv" ]; maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; diff --git a/nixpkgs/pkgs/development/libraries/libva/utils.nix b/nixpkgs/pkgs/development/libraries/libva/utils.nix index eb2a6598cf6f..777119378d34 100644 --- a/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.20.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-oW4vIGgSs5lzmuloCFJPXTmsfH9Djz2KTlsjrOkaT5I="; + sha256 = "sha256-ZX6ahKnOB5ZEg36iIWskq3q26GVg/trsCAKKttEKZ1s="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch b/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch deleted file mode 100644 index 42017a993b51..000000000000 --- a/nixpkgs/pkgs/development/libraries/libwnck/fix-pc-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/meson.build b/meson.build -index 28799d8..047e523 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,11 +72,15 @@ - pc_conf = configuration_data() - pc_conf.set('prefix', get_option('prefix')) - pc_conf.set('exec_prefix', '${prefix}') --pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir')) --pc_conf.set('includedir', '${prefix}/' + get_option('includedir')) --pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) -+pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir')) -+pc_conf.set('includedir', '${prefix}' / get_option('includedir')) -+if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify()) -+ pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) -+endif - pc_conf.set('X11_PACKAGE', X11_PACKAGE) --pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) -+if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify()) -+ pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) -+endif - pc_conf.set('VERSION', meson.project_version()) - - foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled'] diff --git a/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix index 356f87ff264b..dbca7f7fc2b7 100644 --- a/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.38"; + version = "1.1.39"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HzJFBCWBmgmsr/Krelp/ii7HlW5QXXvutF6EPQ4eyrE="; + hash = "sha256-KiCtYhFIM5sHWcTU6WcZNi3uZMmgltu6YlugU4RjSfA="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/loudmouth/glib-2.32.patch b/nixpkgs/pkgs/development/libraries/loudmouth/glib-2.32.patch deleted file mode 100644 index 87fc170c80da..000000000000 --- a/nixpkgs/pkgs/development/libraries/loudmouth/glib-2.32.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: loudmouth-1.4.3/loudmouth/lm-error.c -=================================================================== ---- loudmouth-1.4.3.orig/loudmouth/lm-error.c -+++ loudmouth-1.4.3/loudmouth/lm-error.c -@@ -19,7 +19,7 @@ - */ - - #include <config.h> --#include <glib/gerror.h> -+#include <glib.h> - #include "lm-error.h" - - /** diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index dac12db94b62..bcff20f1847c 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + mesonFlags = lib.optionals stdenv.isDarwin [ + "-Dgl_provider=gl" # glvnd is default + ]; + enableParallelBuilding = true; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 173cc2016e5d..b4b70fcab4f5 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -133,6 +133,29 @@ self = stdenv.mkDerivation { ./opencl.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch + ] ++ lib.optionals stdenv.isDarwin [ + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/44734d1fe98ef47019fe2c56d867d1645c526e4e.diff"; + hash = "sha256-ipaISEY5xcnGvrwFxNY80JVlYWddfiHofkYEBuPkyDY="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/d2a46afbfc44121aa491a2b4d1a3249d26fc6a11.diff"; + hash = "sha256-i00s9oUhZXXf/A4cHwWN6uRDP70cHjz+kgVpiDM/eMw="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/17cde1ee87cc0cbb896ca81949b8f192d5496271.diff"; + hash = "sha256-ao2pWQwMBskOjWJsjWqwFYAeqpTWAyJbEtSryDO+xyo="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/4489d737d5c12eb0a3441ed0b303f9f1100a7166.diff"; + hash = "sha256-WxqwEngd79NHLedQOWMjjroaN0gr6Upd96uteSvr4Yw="; + }) + # fixes a linking error + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/c8b64452c076c1768beb23280de25faf2bcbe2c8.diff"; + hash = "sha256-mqivdzyoLtkfkAb+r57gjPwg8d7whgFAahiUhGVOOvo="; + }) ]; postPatch = '' @@ -202,6 +225,15 @@ self = stdenv.mkDerivation { # Enable RT for Intel hardware # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) + ] ++ lib.optionals stdenv.isDarwin [ + # Disable features that are explicitly unsupported on the platform + "-Dgbm=disabled" + "-Dxlib-lease=disabled" + "-Degl=disabled" + "-Dgallium-vdpau=disabled" + "-Dgallium-va=disabled" + "-Dgallium-xa=disabled" + "-Dlmsensors=disabled" ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend "-Dgallium-opencl=icd" @@ -379,9 +411,6 @@ self = stdenv.mkDerivation { license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :) - - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - broken = stdenv.isDarwin; }; }; diff --git a/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index bfb7cd26fbb2..5be1f2e51925 100644 --- a/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" "-DMZ_OPENSSL=ON" - "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" - "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" + "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DMZ_LIB_SUFFIX='-ng'" ] ++ lib.optionals stdenv.isDarwin [ # missing header file diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index ded5a5990a60..22a38921ec49 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -24,6 +24,7 @@ , cudaSupport ? config.cudaSupport , cudaPackages ? { } , enableJackrack ? stdenv.isLinux +, glib , ladspa-sdk , ladspaPlugins , enablePython ? false @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ lib.optionals enableJackrack [ + glib ladspa-sdk ladspaPlugins ] ++ lib.optionals enableQt [ diff --git a/nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch b/nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch deleted file mode 100644 index 5d99f1951f7a..000000000000 --- a/nixpkgs/pkgs/development/libraries/mp4v2/fix-build-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/mp4.cpp b/src/mp4.cpp -index c2a7238..9bb3e38 100644 ---- a/src/mp4.cpp -+++ b/src/mp4.cpp -@@ -870,7 +870,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file - } - - catch (...) { -- return MP4_INVALID_TRACK_ID; -+ return NULL; - } - } - diff --git a/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix index fed8cee33231..41d174bce7d9 100644 --- a/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built - ] ++ lib.optional (!finalAttrs.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + ] ++ lib.optional (!finalAttrs.finalPackage.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; checkInputs = [ gtest diff --git a/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix b/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix index 198593df5018..25ce9a5520d2 100644 --- a/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built - ] ++ lib.optional finalAttrs.doCheck "-DMSGPACK_BUILD_TESTS=ON"; + ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DMSGPACK_BUILD_TESTS=ON"; checkInputs = [ zlib diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/fix-compilation-with-olm-3.2.5.patch b/nixpkgs/pkgs/development/libraries/mtxclient/fix-compilation-with-olm-3.2.5.patch deleted file mode 100644 index 02337d56f1ff..000000000000 --- a/nixpkgs/pkgs/development/libraries/mtxclient/fix-compilation-with-olm-3.2.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur old/lib/crypto/client.cpp c5pf6ygk9v9rdwwr3dyd24wghflp0vmx-source/lib/crypto/client.cpp ---- old/lib/crypto/client.cpp 2021-10-22 19:31:52.159836190 +0300 -+++ c5pf6ygk9v9rdwwr3dyd24wghflp0vmx-source/lib/crypto/client.cpp 2021-10-22 19:30:42.882010441 +0300 -@@ -37,15 +37,15 @@ - - }; - --OlmErrorCode -+mtx::crypto::OlmErrorCode - olm_exception::ec_from_string(std::string_view error) - { - for (size_t i = 0; i < olmErrorStrings.size(); i++) { - if (olmErrorStrings[i] == error) -- return static_cast<OlmErrorCode>(i); -+ return static_cast<mtx::crypto::OlmErrorCode>(i); - } - -- return OlmErrorCode::UNKNOWN_ERROR; -+ return mtx::crypto::OlmErrorCode::UNKNOWN_ERROR; - } - - void diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix index ef4e423d059a..0ee442aedbcb 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.1.8"; + version = "5.1.9"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-ASZyvcP9XVFPf7nTsBx5E+D/7fWzUslPZrmhhNY5DzQ="; + hash = "sha256-D7WmJ53oK4craLx6PKAFA6Ue7wl5fRYPeEFeh78Kpdg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix index ea3bc808a0bb..e5dbb563cfb5 100644 --- a/nixpkgs/pkgs/development/libraries/newt/default.nix +++ b/nixpkgs/pkgs/development/libraries/newt/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "newt"; - version = "0.52.23"; + version = "0.52.24"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-yqNykHsU7Oz+KY8NUSpi9B0zspBhAkSliu0Hu8WtoSo="; + sha256 = "sha256-Xe1+Ih+F9kJSHEmxgmyN4ZhFqjcrr11jClF3S1RPvbs="; }; postPatch = '' @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://pagure.io/newt"; description = "Library for color text mode, widget based user interfaces"; - + homepage = "https://pagure.io/newt"; + changelog = "https://pagure.io/newt/blob/master/f/CHANGES"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index 851d687077cd..f4760ea9e669 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc="; + hash = "sha256-z6lvtfO5XL/bZgbE+Sak+32QzjEhAdOnkpIO731h+bk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 29c7ca2c690b..339db2bb0879 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake }: let @@ -13,40 +12,22 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${finalAttrs.version}"; - hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; + hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; }; - patches = [ - # Backport fix for gcc-13: - # https://github.com/nlohmann/json/pull/3895 - (fetchpatch { - name = "gcc-13-rebind.patch"; - url = "https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch"; - hash = "sha256-Jbi0VwZP+ZHTGbpIwgKCVc66gOmwjkT5iOUe85eIzM0="; - }) - - # Backport fix for gcc-13: - # https://github.com/nlohmann/json/pull/3950 - (fetchpatch { - name = "gcc-13-eq-op.patch"; - url = "https://github.com/nlohmann/json/commit/a49829bd984c0282be18fcec070df0c31bf77dd5.patch"; - hash = "sha256-D+cRtdN6AXr4z3/y9Ui7Zqp3e/y10tp+DOL80ZtPz5E="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DJSON_BuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DJSON_BuildTests=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DJSON_FastTests=ON" "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; + ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/nixpkgs/pkgs/development/libraries/nss/esr.nix b/nixpkgs/pkgs/development/libraries/nss/esr.nix index fe3cc87192af..55e09511aab1 100644 --- a/nixpkgs/pkgs/development/libraries/nss/esr.nix +++ b/nixpkgs/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { version = "3.90"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + hash = "sha256-ZEG6ZcEymQ8Yw02ziT2LFWuvwZ1rRuT93rRHGYM22yQ="; } diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index 592dbffbdffc..82bbd2f4a13f 100644 --- a/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -1,7 +1,7 @@ -{ version, hash }: +{ version, hash, github ? false }: { lib , stdenv -, fetchurl +, fetchFromGitHub , nspr , perl , zlib @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { pname = "nss"; inherit version; - src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "nss-dev"; + repo = "nss"; + rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; inherit hash; }; @@ -50,25 +52,21 @@ stdenv.mkDerivation rec { ./remove-c25519-support.patch ]; - patchFlags = [ "-p0" ]; - postPatch = '' - patchShebangs nss + patchShebangs . - for f in nss/coreconf/config.gypi nss/build.sh; do + for f in coreconf/config.gypi build.sh; do substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" done - substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" + substituteInPlace coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" - substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" + substituteInPlace coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + substituteInPlace coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; outputs = [ "out" "dev" "tools" ]; - preConfigure = "cd nss"; - buildPhase = let getArch = platform: diff --git a/nixpkgs/pkgs/development/libraries/nss/latest.nix b/nixpkgs/pkgs/development/libraries/nss/latest.nix index 9244978061ee..a759e2c86f5e 100644 --- a/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/nixpkgs/pkgs/development/libraries/nss/latest.nix @@ -6,5 +6,5 @@ import ./generic.nix { version = "3.95"; - hash = "sha256-RpiI5B6KeABRzgDtzZFOimvTjaiKgs+4SJjdOIY1gio="; + hash = "sha256-qgSbzlRbU+gElC2ae3FEGRUFSM1JHd/lNGNXC0x4xt4="; } diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 5ef4f676aebc..c9e6aeeba363 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2_3 }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - hash = "sha256-ww7Kqzlnf7065i9RZLeFDUOPBMCVgV/6sBnN0+WvBTk="; + hash = "sha256-KteLH031QP8MunQXsodzsPhD/YN9n3O7b2kb/1mFQRY="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ catch2 ]; + buildInputs = [ catch2_3 ]; propagatedBuildInputs = [ icu ]; cmakeFlags = [ "-DBUILD_TESTING=YES" ]; diff --git a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index a82fa9068c66..813821bfb71c 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, cudaPackages }: stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; @@ -18,6 +18,13 @@ stdenv.mkDerivation { cp -R * $out/include ''; + # Makes setupCudaHook propagate nvidia-optical-flow-sdk together with cuda + # packages. Currently used by opencv4.cxxdev, hopefully can be removed in the + # future + nativeBuildInputs = [ + cudaPackages.markForCudatoolkitRootHook + ]; + meta = with lib; { description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; homepage = "https://developer.nvidia.com/opticalflow-sdk"; diff --git a/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix deleted file mode 100644 index f68b57f193b7..000000000000 --- a/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, config -, fetchFromGitHub -, stdenv -, cmake -, pkg-config -, cudaPackages ? { } -, symlinkJoin -, tbb -, hostSystem ? "CPP" -, deviceSystem ? if config.cudaSupport then "CUDA" else "OMP" -}: - -# Policy for device_vector<T> -assert builtins.elem deviceSystem [ - "CPP" # Serial on CPU - "OMP" # Parallel with OpenMP - "TBB" # Parallel with Intel TBB - "CUDA" # Parallel on GPU -]; - -# Policy for host_vector<T> -# Always lives on CPU, but execution can be made parallel -assert builtins.elem hostSystem [ "CPP" "OMP" "TBB" ]; - -let - pname = "nvidia-thrust"; - version = "1.16.0"; - - inherit (cudaPackages) backendStdenv cudaFlags; - cudaCapabilities = map cudaFlags.dropDot cudaFlags.cudaCapabilities; - - tbbSupport = builtins.elem "TBB" [ deviceSystem hostSystem ]; - cudaSupport = deviceSystem == "CUDA"; - - # TODO: Would like to use this: - cudaJoined = symlinkJoin { - name = "cuda-packages-unsplit"; - paths = with cudaPackages; [ - cuda_nvcc - cuda_nvrtc # symbols: cudaLaunchDevice, &c; notice postBuild - cuda_cudart # cuda_runtime.h - libcublas - ]; - postBuild = '' - ln -s $out/lib $out/lib64 - ''; - }; -in -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "thrust"; - rev = version; - fetchSubmodules = true; - hash = "sha256-/EyznxWKuHuvHNjq+SQg27IaRbtkjXR2zlo2YgCWmUQ="; - }; - - # NVIDIA's "compiler hacks" seem like work-arounds for legacy toolchains and - # cause us errors such as: - # > Thrust's test harness uses CMAKE_CXX_COMPILER for the CUDA host compiler. - # > Refusing to overwrite specified CMAKE_CUDA_HOST_COMPILER - # So we un-fix cmake after them: - postPatch = '' - echo > cmake/ThrustCompilerHacks.cmake - ''; - - buildInputs = lib.optionals tbbSupport [ tbb ]; - - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals cudaSupport [ - # Goes in native build inputs because thrust looks for headers - # in a path relative to nvcc... - cudaJoined - ]; - - cmakeFlags = [ - "-DTHRUST_INCLUDE_CUB_CMAKE=${if cudaSupport then "ON" else "OFF"}" - "-DTHRUST_DEVICE_SYSTEM=${deviceSystem}" - "-DTHRUST_HOST_SYSTEM=${hostSystem}" - "-DTHRUST_AUTO_DETECT_COMPUTE_ARCHS=OFF" - "-DTHRUST_DISABLE_ARCH_BY_DEFAULT=ON" - ] ++ lib.optionals cudaFlags.enableForwardCompat [ - "-DTHRUST_ENABLE_COMPUTE_FUTURE=ON" - ] ++ map (sm: "THRUST_ENABLE_COMPUTE_${sm}") cudaCapabilities; - - passthru = { - inherit cudaSupport cudaPackages cudaJoined; - }; - - meta = with lib; { - description = "A high-level C++ parallel algorithms library that builds on top of CUDA, TBB, OpenMP, etc"; - homepage = "https://github.com/NVIDIA/thrust"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ SomeoneSerge ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix index d35976932663..6ae60b7b2d3a 100644 --- a/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, darwin +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ode"; version = "0.16.4"; src = fetchurl { - url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; + url = "https://bitbucket.org/odedevs/ode/downloads/ode-${finalAttrs.version}.tar.gz"; + hash = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.GLUT + ]; + + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ + "-std=c++14" + "-Wno-error=c++11-narrowing" + ]); + meta = with lib; { description = "Open Dynamics Engine"; homepage = "https://www.ode.org"; - platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; + license = with licenses; [ bsd3 lgpl21Only lgpl3Only zlib ]; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/open62541/default.nix b/nixpkgs/pkgs/development/libraries/open62541/default.nix index 7799c6d80ae3..b8c22a73dd4e 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.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4="; + hash = "sha256-FnLMR54xjIyYRqwCnvMJsNgsVwH7hVAixCNGhfIZPiw="; fetchSubmodules = true; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" "-DUA_NAMESPACE_ZERO=FULL" - "-DUA_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DUA_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ] ++ lib.optional withExamples "-DUA_BUILD_EXAMPLES=ON" ++ lib.optional (withEncryption != false) @@ -92,16 +92,15 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; preCheck = let - disabledTests = - lib.optionals withPubSub [ - # "Cannot set socket option IP_ADD_MEMBERSHIP" - "pubsub_publish" - "check_pubsub_get_state" - "check_pubsub_publish_rt_levels" - "check_pubsub_subscribe_config_freeze" - "check_pubsub_subscribe_rt_levels" - "check_pubsub_multiple_subscribe_rt_levels" - ]; + disabledTests = lib.optionals withPubSub [ + # "Cannot set socket option IP_ADD_MEMBERSHIP" + "pubsub_publish" + "check_pubsub_get_state" + "check_pubsub_publish_rt_levels" + "check_pubsub_subscribe_config_freeze" + "check_pubsub_subscribe_rt_levels" + "check_pubsub_multiple_subscribe_rt_levels" + ]; regex = "^(${builtins.concatStringsSep "|" disabledTests})\$"; in lib.optionalString (disabledTests != []) '' checkFlagsArray+=(ARGS="-E ${lib.escapeRegex regex}") diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 06360449c1ba..023e56940b75 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -247,8 +247,10 @@ effectiveStdenv.mkDerivation { outputs = [ "out" + "cxxdev" "package_tests" ]; + cudaPropagateToOutput = "cxxdev"; postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" @@ -328,20 +330,32 @@ effectiveStdenv.mkDerivation { bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart - cuda_cccl # <thrust/*> - libnpp # npp.h + ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart.lib + cuda_cudart.dev + cuda_cccl.dev # <thrust/*> + libnpp.dev # npp.h + libnpp.lib + libnpp.static + nvidia-optical-flow-sdk ] ++ lib.optionals enableCublas [ - libcublas # cublas_v2.h + # May start using the default $out instead once + # https://github.com/NixOS/nixpkgs/issues/271792 + # has been addressed + libcublas.static + libcublas.lib + libcublas.dev # cublas_v2.h ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h + cudnn.dev # cudnn.h + cudnn.lib + cudnn.static ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]); + libcufft.dev # cufft.h + libcufft.lib + libcufft.static + ]); - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy - ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ]; + propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; nativeBuildInputs = [ cmake pkg-config unzip ] ++ lib.optionals enablePython [ @@ -458,6 +472,7 @@ effectiveStdenv.mkDerivation { postInstall = '' sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \ "$out/lib/pkgconfig/opencv4.pc" + mkdir $cxxdev '' # install python distribution information, so other packages can `import opencv` + lib.optionalString enablePython '' @@ -476,6 +491,8 @@ effectiveStdenv.mkDerivation { ''; passthru = { + cudaSupport = enableCuda; + tests = { inherit (gst_all_1) gst-plugins-bad; } diff --git a/nixpkgs/pkgs/development/libraries/openh264/default.nix b/nixpkgs/pkgs/development/libraries/openh264/default.nix index 479ffbc78eee..c250b31ecd71 100644 --- a/nixpkgs/pkgs/development/libraries/openh264/default.nix +++ b/nixpkgs/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L5u0xkoza3G1ZHdtJH7ayVOgcVbPWYp7MC3lJd7LsSY="; + hash = "sha256-vPVHXATsSWmqKOAj09WRR5jCi2NU2lq0j4K15KBzARY="; }; nativeBuildInputs = [ nasm ]; diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 1c4955e2c51a..a8bd8acacd59 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -3,7 +3,7 @@ , libpsm2, libfabric, pmix, ucx, ucc , config # Enable CUDA support -, cudaSupport ? config.cudaSupport, cudatoolkit +, cudaSupport ? config.cudaSupport, cudaPackages # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -18,12 +18,7 @@ , fortranSupport ? true }: -let - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-unsplit"; - paths = [ cudatoolkit.out cudatoolkit.lib ]; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "openmpi"; version = "4.1.6"; @@ -47,12 +42,13 @@ in stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] - ++ lib.optionals cudaSupport [ cudatoolkit ] + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core ++ lib.optionals fabricSupport [ libpsm2 libfabric ]; nativeBuildInputs = [ perl ] + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals fortranSupport [ gfortran ]; configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" @@ -67,7 +63,7 @@ in stdenv.mkDerivation rec { # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda - ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] + ++ lib.optionals cudaSupport [ "--with-cuda=${cudaPackages.cuda_cudart}" "--enable-dlopen" ] ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] ; @@ -98,7 +94,8 @@ in stdenv.mkDerivation rec { doCheck = true; passthru = { - inherit cudaSupport cudatoolkit; + inherit cudaSupport; + cudatoolkit = cudaPackages.cudatoolkit; # For backward compatibility only }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index b0ff4b528864..9c485949a5c0 100644 --- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -1,9 +1,7 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? config.cudaSupport, cudatoolkit - # For visibility mostly. The whole approach to cuda architectures and capabilities - # will be reworked soon. -, cudaArch ? "compute_37" +, cudaSupport ? config.cudaSupport +, cudaPackages , openclSupport ? !cudaSupport , darwin }: @@ -21,7 +19,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional cudaSupport [ + cudaPackages.cuda_nvcc + ]; buildInputs = [ libGLU libGL python3 # FIXME: these are not actually needed, but the configure script wants them. @@ -30,21 +33,31 @@ stdenv.mkDerivation rec { ] ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) - ++ lib.optional cudaSupport cudatoolkit; + ++ lib.optional cudaSupport [ + cudaPackages.cuda_cudart + ]; + + # It's important to set OSD_CUDA_NVCC_FLAGS, + # because otherwise OSD might piggyback unwanted architectures: + # https://github.com/PixarAnimationStudios/OpenSubdiv/blob/7d0ab5530feef693ac0a920585b5c663b80773b3/CMakeLists.txt#L602 + preConfigure = lib.optionalString cudaSupport '' + cmakeFlagsArray+=( + -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.cudaFlags.gencode}" + ) + ''; cmakeFlags = [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" "-DNO_METAL=1" # don’t have metal in apple sdk + (lib.cmakeBool "NO_OPENCL" (!openclSupport)) + (lib.cmakeBool "NO_CUDA" (!cudaSupport)) ] ++ lib.optionals (!stdenv.isDarwin) [ "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" ] ++ lib.optionals cudaSupport [ - "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=${cudaArch}" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] ++ lib.optionals (!openclSupport) [ - "-DNO_OPENCL=1" ]; preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport '' diff --git a/nixpkgs/pkgs/development/libraries/openvino/default.nix b/nixpkgs/pkgs/development/libraries/openvino/default.nix index b3809f095364..26fac012948d 100644 --- a/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchurl , substituteAll +, cudaSupport ? opencv.cudaSupport or false # build , addOpenGLRunpath @@ -17,10 +18,12 @@ # runtime , libusb1 , libxml2 +, ocl-icd , opencv , protobuf , pugixml , tbb +, cudaPackages }: let @@ -68,6 +71,8 @@ stdenv.mkDerivation rec { setuptools ])) shellcheck + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc ]; patches = [ @@ -118,6 +123,7 @@ stdenv.mkDerivation rec { "-DENABLE_CPPLINT:BOOL=OFF" "-DBUILD_TESTING:BOOL=OFF" "-DENABLE_SAMPLES:BOOL=OFF" + (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; @@ -129,10 +135,13 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 libxml2 - opencv + ocl-icd + opencv.cxxdev protobuf pugixml tbb + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 1d089774cc67..1e01ed4a607a 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.25.0"; + version = "0.25.3"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - hash = "sha256-paLiRYgYshuedgDgW2nEsv4/Loq6qFyQMjfBJwqtHzw="; + hash = "sha256-zIbkw0pwt4TdyjncnSDeTN6Gsx7cc+x7Un4rnagZxQk="; + fetchSubmodules = true; }; outputs = [ "out" "bin" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix index 2e390da0bef4..62d9aa597792 100644 --- a/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.cpp"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; rev = "v${version}"; - hash = "sha256-QV6r4GzSVghgVQtF8OQ1a23PtCdjg7PeuGRBdA+WbE0="; + hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix index dc95b4ed8266..dd20b6dcebe6 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -50,7 +50,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - env.NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fPIC" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=enum-constexpr-conversion" + ]); cmakeBuildType = if debug then "Debug" else "Release"; diff --git a/nixpkgs/pkgs/development/libraries/physics/apfel/cmake.patch b/nixpkgs/pkgs/development/libraries/physics/apfel/cmake.patch new file mode 100644 index 000000000000..5bc342aeb48c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/physics/apfel/cmake.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,8 +46,8 @@ message(STATUS "APFEL: APFEL_DOWNLOAD_PDFS=${APFEL_DOWNLOAD_PDFS}") + # CONFIG SCRIPT ======================================================== + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "${prefix}") +-set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +-set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}") ++set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") + set(PACKAGE_VERSION "${apfel_VERSION}") + configure_file("${PROJECT_SOURCE_DIR}/bin/apfel-config.in" "${PROJECT_BINARY_DIR}/bin/apfel-config") + configure_file("${PROJECT_SOURCE_DIR}/bin/apfel.in" "${PROJECT_BINARY_DIR}/bin/apfel") diff --git a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix index c0860d9a1baf..e1192cdcd05e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix @@ -1,28 +1,59 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gfortran, lhapdf, python3, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gfortran +, lhapdf +, python3 +, swig +, zlib +}: stdenv.mkDerivation rec { pname = "apfel"; - version = "3.0.6"; + version = "3.1.1"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; rev = version; - sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o="; + hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc="; }; - # needed for aarch64-darwin - nativeBuildInputs = [ autoreconfHook ]; + patches = [ + # https://github.com/scarrazza/apfel/pull/54 + ./cmake.patch + ]; - buildInputs = [ gfortran lhapdf python3 zlib ]; + nativeBuildInputs = [ + cmake + swig + ]; + buildInputs = [ + gfortran + lhapdf + python3 + zlib + ]; - enableParallelBuilding = true; + cmakeFlags = [ + "-DAPFEL_DOWNLOAD_PDFS=OFF" + "-DAPFEL_Python_SITEARCH=autoprefix" + ]; + + doCheck = true; + nativeCheckInputs = [ + lhapdf.pdf_sets.NNPDF23_nlo_as_0118 + lhapdf.pdf_sets.NNPDF31_nnlo_as_0118 + ]; + + env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}"; meta = with lib; { description = "A PDF Evolution Library"; - license = licenses.gpl3Plus; - homepage = "https://apfel.mi.infn.it/"; - platforms = platforms.unix; + homepage = "https://apfel.mi.infn.it/"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index b61db08457fd..3c4e8008639c 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { for f in Makefile.in */Makefile; do substituteInPlace "$f" --replace "CXX=g++" "" done - patchShebangs ./configure ./utils/check.sh ./utils/install-sh + patchShebangs ./utils/check.sh ./utils/install-sh ''; # Written in shell manually, does not support autoconf-style diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix index 00f548806fc5..0482846f077a 100644 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,30 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: +{ lib, stdenv, fetchurl, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; + sha256 = "sha256-JEOksyzDsFl8gki9biVwOs6ckaeiU8X2CxtUKO+chp4="; }; - patches = [ - # avoid silent compilation failures - (fetchpatch { - name = "lhapdf-propagate_returncode.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; - hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; - }) - - # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin - (fetchpatch { - name = "lhapdf-Wl_stack_size.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; - hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; - }) - ]; - # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 0916eae24669..917dbf40a37d 100644 --- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ boost fastjet hepmc zlib lhapdf ]; - preConfigure = '' - patchShebangs ./configure - ''; - configureFlags = [ "--enable-shared" "--with-lhapdf6=${lhapdf}" diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index fdfc713d53a3..76a4d71b38e4 100644 --- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-dbPz1BnKY4jR/S7A7afh+Q8yS5lszwWR9IpdLijczBM="; + hash = "sha256-9lMgRdph7rKtwgqavEFmtLLUGrLByltQDNYWuxuS57E="; }; latex = texliveBasic.withPackages (ps: with ps; [ diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index da6c21db0ff0..68f4e3714e09 100644 --- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , python , root , makeWrapper @@ -11,22 +10,13 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-e8MGJGirulCv8+y4sizmdxlgNgCYkGiO9FM6qn+S5uQ="; + hash = "sha256-68rVU2mhztzuOi3gWUB8hRZSukRJURP1wJ2MLlf1Fqo="; }; - patches = [ - # A bugfix https://gitlab.com/hepcedar/yoda/-/merge_requests/116 - (fetchpatch { - url = "https://gitlab.com/hepcedar/yoda/-/commit/ba1275033522c66bc473dfeffae1a7971e985611.diff"; - hash = "sha256-/8UJuypiQzywarE+o3BEMtqM+f+YzkHylugi+xTJf+w="; - excludes = [ "ChangeLog" ]; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 3876a5c892a0..5d0ffee503b8 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.84"; + version = "1.0.0"; outputs = [ "out" @@ -97,7 +97,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; + sha256 = "sha256-mfnMluxJAxDbB6JlIM6HJ0zg7e1q3ia3uFbht6zeHCk="; }; patches = [ @@ -189,6 +189,7 @@ let "-Dsdl2=disabled" # required only to build examples, causes dependency loop "-Drlimits-install=false" # installs to /etc, we won't use this anyway "-Dcompress-offload=enabled" + "-Dman=enabled" ]; # Fontconfig error: Cannot load default config file @@ -197,7 +198,7 @@ let doCheck = true; postUnpack = '' - patchShebangs source/doc/input-filter.sh + patchShebangs source/doc/*.py patchShebangs source/doc/input-filter-h.sh ''; diff --git a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix index 660313092202..3723a6806ad9 100644 --- a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix +++ b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "sha256-HPaPmsCJ81NaS7mgRGbR7KFG6AM3s6HXdWKdfREhcLc="; + hash = "sha256-FP3y/YHsPPqey4QfxIiC4QjruuK1K2Bg+2QL2gXDT+k="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index d2af5d9e1e94..89c91ccd9206 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -102,10 +102,10 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") (mkFlag gpgmeSupport "GPGME") - ] ++ lib.optionals finalAttrs.doCheck [ + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ "-DTESTDATADIR=${testData}" ]; - disallowedReferences = lib.optional finalAttrs.doCheck testData; + disallowedReferences = lib.optional finalAttrs.finalPackage.doCheck testData; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index ce1f74f0b153..fedb1b003d96 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "proj"; - version = "9.3.0"; + version = "9.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-M1KUXzht4qIjPfHxvzPr7XUnisMwtbegKp18XQjNYHg="; + hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix index 72538da6a997..65ad4ed6a293 100644 --- a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q="; }; - postPatch = lib.optionalString (!finalAttrs.doCheck) '' + postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i "/add_subdirectory(tests)/d" CMakeLists.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/25.nix b/nixpkgs/pkgs/development/libraries/protobuf/25.nix new file mode 100644 index 000000000000..b994f6060942 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/25.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "25.1"; + hash = "sha256-w6556kxftVZ154LrZB+jv9qK+QmMiUOGj6EcNwiV+yo="; +} // args) diff --git a/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix index f0b7c8478e08..d238b8137d33 100644 --- a/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -4,28 +4,19 @@ stdenv.mkDerivation rec { pname = "python-qt"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; rev = "v${version}"; - hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k="; + hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; }; - patches = [ - (fetchpatch { - name = "remove-unneeded-pydebug-include.patch"; - url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch"; - includes = [ "src/PythonQt.cpp" ]; - hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0="; - }) - ]; - # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt postPatch = '' substituteInPlace build/python.prf \ - --replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}" + --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" ''; hardeningDisable = [ "all" ]; diff --git a/nixpkgs/pkgs/development/libraries/qcoro/default.nix b/nixpkgs/pkgs/development/libraries/qcoro/default.nix index 96cf2cd6fc8e..e178dd5240d6 100644 --- a/nixpkgs/pkgs/development/libraries/qcoro/default.nix +++ b/nixpkgs/pkgs/development/libraries/qcoro/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-kf2W/WAZCpLkq1UIy7iZri4vNaqjGjotB/Xsb+byZV4="; + sha256 = "sha256-C4k5ClsMwzxURAQBGV5WBwlRr5N0SvUMJobZ+ROT0EY="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix b/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix index a8d11529808f..7d1384df364b 100644 --- a/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace libqmenumodel/QMenuModel/CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' patchShebangs tests/{client,script}/*.py ''; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index d80309f2b16b..2cabf5022844 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.6.1"; + version = "11.6.3"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-QXRzvSMi6gKISJo44KIjTYENNqxh1yDhUUhEZa8uz6Q="; + hash = "sha256-asGNZ/5iEkyIjRO9FECV1bN4k/YHv4/7I125BUr9+fE="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 860e39227513..aa0611aaef20 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.2"; + version = "6.13.3"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-Kdvr3T9hynLCj99+Rc1L0Gq7xkiM0a6xovuqhAncrek="; + hash = "sha256-/3PEbUMphblB3HgLkDb4l7GykuXL/ZOsKBrs8h72uwE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index 2e1163e5f59c..e01934b1d731 100644 --- a/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 968cc5181327..400c7297d22b 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-v/FjnDg22ZNQHmrUsPvjaCs4UQ/RPAxQdg9i8k6ba/4="; + sha256 = "sha256-F67aKmyMmqBVG5sF8ZwqemmfvVi/0bDjaiugKKSipuA="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix b/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix index 48d2bd14badb..bc075df237c7 100644 --- a/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix +++ b/nixpkgs/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -2,4 +2,10 @@ patch: [ (patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv") +(patch "002" "0ly0siy6qy3l7hv12847adpfa34yq1w4qz9qkw6vrxv25j106rg0") +(patch "003" "1c5cwvvkx9mfmpaapymq9cavmzh4fnagkjlchsqx4vml8sx8gx94") +(patch "004" "1b15sndx9v5vj3x1f3h73099nlagknx4rbfpd5ldrbw2xgm2wmvr") +(patch "005" "16ac25jz1a1mgkpfp1sydqf6qpsfh0s0dcmrnjpqbhg5va3s6av2") +(patch "006" "18gmh6y3klh0vv28cyqz4is3rlb32pl7f1kf5r482kfjq3w5zd67") +(patch "007" "1xmnpahs983n4w0gn3j0wr8nh1dpva33yj7fvfmhm46ph2wsa4ar") ] diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix index 953fe50a4b03..0d0e3c114920 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "bpp-core"; @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; }; + patches = [ + (fetchpatch { + url = "https://github.com/BioPP/bpp-core/commit/d450e8033b06e80dff9c2236fb7ce1f3ced5dcbb.patch"; + hash = "sha256-9t68mrK7KNs5BxljKMaA+XskCcKDNv8DNCVUYunoNdw="; + }) + ]; + nativeBuildInputs = [ cmake ]; postFixup = '' diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index 349c3be82b96..94a88bbf819a 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-89ngeZHdjyL/OoGuQ+F5eaXE1/od0EEfIgw9eKdLtL8="; + hash = "sha256-uNAqjklgBWM2v2z6qu17ZMFO4gn3fsnYPxyGO++UtTw="; }; # "This test is stochastic and may occassionally fail". It does. @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableCuda cudaPackages.cudatoolkit; propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ + setuptools python numpy cython @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { cd python ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out + mv $out/lib/python*/site-packages/OpenMM*.egg/{openmm,simtk} $out/lib/python*/site-packages/. ''; postFixup = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix deleted file mode 100644 index d4c83428980d..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix +++ /dev/null @@ -1,66 +0,0 @@ -# Support matrix can be found at -# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html -# Type aliases -# Release = { -# version: String, -# minCudaVersion: String, -# maxCudaVersion: String, -# url: String, -# hash: String, -# } -final: prev: let - inherit (final) callPackage; - inherit (prev) cudaVersion; - inherit (prev.lib) attrsets lists versions; - inherit (prev.lib.strings) replaceStrings versionAtLeast versionOlder; - - # Compute versioned attribute name to be used in this package set - # Patch version changes should not break the build, so we only use major and minor - # computeName :: String -> String - computeName = version: "cudnn_${replaceStrings ["."] ["_"] (versions.majorMinor version)}"; - - # Check whether a CUDNN release supports our CUDA version - # Thankfully we're able to do lexicographic comparison on the version strings - # isSupported :: Release -> Bool - isSupported = release: - versionAtLeast cudaVersion release.minCudaVersion - && versionAtLeast release.maxCudaVersion cudaVersion; - - # useCudatoolkitRunfile :: Bool - useCudatoolkitRunfile = versionOlder cudaVersion "11.3.999"; - - # buildCuDnnPackage :: Release -> Derivation - buildCuDnnPackage = callPackage ./generic.nix {inherit useCudatoolkitRunfile;}; - - # Reverse the list to have the latest release first - # cudnnReleases :: List Release - cudnnReleases = lists.reverseList (builtins.import ./releases.nix); - - # Check whether a CUDNN release supports our CUDA version - # supportedReleases :: List Release - supportedReleases = builtins.filter isSupported cudnnReleases; - - # Function to transform our releases into build attributes - # toBuildAttrs :: Release -> { name: String, value: Derivation } - toBuildAttrs = release: { - name = computeName release.version; - value = buildCuDnnPackage release; - }; - - # Add all supported builds as attributes - # allBuilds :: AttrSet String Derivation - allBuilds = builtins.listToAttrs (builtins.map toBuildAttrs supportedReleases); - - defaultBuild = attrsets.optionalAttrs (supportedReleases != []) { - cudnn = let - # The latest release is the first element of the list and will be our default choice - # latestReleaseName :: String - latestReleaseName = computeName (builtins.head supportedReleases).version; - in - allBuilds.${latestReleaseName}; - }; - - # builds :: AttrSet String Derivation - builds = allBuilds // defaultBuild; -in - builds diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix deleted file mode 100644 index b9f101d80fa3..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ stdenv, - backendStdenv, - lib, - lndir, - zlib, - useCudatoolkitRunfile ? false, - cudaVersion, - cudaMajorVersion, - cudatoolkit, # For cuda < 11 - libcublas ? null, # cuda <11 doesn't ship redist packages - autoPatchelfHook, - autoAddOpenGLRunpathHook, - fetchurl, -}: { - version, - url, - hash, - minCudaVersion, - maxCudaVersion, -}: -assert useCudatoolkitRunfile || (libcublas != null); let - inherit (lib) lists strings trivial versions; - - # majorMinorPatch :: String -> String - majorMinorPatch = (trivial.flip trivial.pipe) [ - (versions.splitVersion) - (lists.take 3) - (strings.concatStringsSep ".") - ]; - - # versionTriple :: String - # Version with three components: major.minor.patch - versionTriple = majorMinorPatch version; -in - backendStdenv.mkDerivation { - pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; - version = versionTriple; - strictDeps = true; - outputs = ["out" "lib" "static" "dev"]; - - src = fetchurl { - inherit url hash; - }; - - # We do need some other phases, like configurePhase, so the multiple-output setup hook works. - dontBuild = true; - - # Check and normalize Runpath against DT_NEEDED using autoPatchelf. - # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") - nativeBuildInputs = [ - autoPatchelfHook - autoAddOpenGLRunpathHook - ]; - - # Used by autoPatchelfHook - buildInputs = [ - # Note this libstdc++ isn't from the (possibly older) nvcc-compatible - # stdenv, but from the (newer) stdenv that the rest of nixpkgs uses - stdenv.cc.cc.lib - - zlib - ] ++ lists.optionals useCudatoolkitRunfile [ - cudatoolkit - ] ++ lists.optionals (!useCudatoolkitRunfile) [ - libcublas.lib - ]; - - # We used to patch Runpath here, but now we use autoPatchelfHook - # - # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in - # version 8.3.2 it seems to have been renamed to simply "lib/". - # - # doc and dev have special output handling. Other outputs need to be moved to their own - # output. - # Note that moveToOutput operates on all outputs: - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 - installPhase = - '' - runHook preInstall - - mkdir -p "$out" - mv * "$out" - moveToOutput "lib64" "$lib" - moveToOutput "lib" "$lib" - moveToOutput "**/*.a" "$static" - - runHook postInstall - ''; - - # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. - postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' - patchelf $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so - ''; - - # The out output leverages the same functionality which backs the `symlinkJoin` function in - # Nixpkgs: - # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 - # - # That should allow us to emulate "fat" default outputs without having to actually create them. - # - # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. - postPhases = ["postPatchelf"]; - # For each output, create a symlink to it in the out output. - # NOTE: We must recreate the out output here, because the setup hook will have deleted it - # if it was empty. - # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases - # which are empty strings are skipped/unset and result in errors of the form "command not - # found: <customPhaseName>". - postPatchelf = '' - mkdir -p "$out" - ${lib.meta.getExe lndir} "$lib" "$out" - ${lib.meta.getExe lndir} "$static" "$out" - ${lib.meta.getExe lndir} "$dev" "$out" - ''; - - passthru = { - inherit useCudatoolkitRunfile; - - cudatoolkit = - trivial.warn - '' - cudnn.cudatoolkit passthru attribute is deprecated; - if your derivation uses cudnn directly, it should probably consume cudaPackages instead - '' - cudatoolkit; - - majorVersion = versions.major versionTriple; - }; - - # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs - # from depending on `out` by default. - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 - # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. - propagatedBuildOutputs = false; - - # By default, if the dev output exists it just uses that. - # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or - # anything of the sort. To remedy this, we set outputSpecified to true, and use - # outputsToInstall, which tells Nix which outputs to use when the package name is used - # unqualified (that is, without an explicit output). - outputSpecified = true; - - meta = with lib; { - # Check that the cudatoolkit version satisfies our min/max constraints (both - # inclusive). We mark the package as broken if it fails to satisfies the - # official version constraints (as recorded in default.nix). In some cases - # you _may_ be able to smudge version constraints, just know that you're - # embarking into unknown and unsupported territory when doing so. - broken = - strings.versionOlder cudaVersion minCudaVersion - || strings.versionOlder maxCudaVersion cudaVersion; - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; - sourceProvenance = with sourceTypes; [binaryNativeCode]; - license = { - shortName = "cuDNN EULA"; - fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; - url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; - free = false; - } // lib.optionalAttrs (!useCudatoolkitRunfile) { - redistributable = true; - }; - platforms = ["x86_64-linux"]; - maintainers = with maintainers; [mdaiter samuela]; - # Force the use of the default, fat output by default (even though `dev` exists, which - # causes Nix to prefer that output over the others if outputSpecified isn't set). - outputsToInstall = ["out"]; - }; - } diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix deleted file mode 100644 index 1cca4d9d015d..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix +++ /dev/null @@ -1,185 +0,0 @@ -# NOTE: Check https://docs.nvidia.com/deeplearning/cudnn/archives/index.html for support matrices. -[ - { - version = "7.4.2.24"; - minCudaVersion = "10.0"; - maxCudaVersion = "10.0"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; - hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; - } - { - version = "7.6.5.32"; - minCudaVersion = "10.0"; - maxCudaVersion = "10.0"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz"; - hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; - } - { - version = "7.6.5.32"; - minCudaVersion = "10.1"; - maxCudaVersion = "10.1"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz"; - hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; - } - { - version = "7.6.5.32"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz"; - hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN="; - } - { - version = "8.0.5.39"; - minCudaVersion = "10.1"; - maxCudaVersion = "10.1"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; - } - { - version = "8.0.5.39"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; - } - { - version = "8.0.5.39"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.0"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.0-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M="; - } - { - version = "8.0.5.39"; - minCudaVersion = "11.1"; - maxCudaVersion = "11.1"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; - } - { - version = "8.1.1.33"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz"; - hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; - } - { - version = "8.1.1.33"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; - } - { - version = "8.2.4.15"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz"; - hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; - } - { - version = "8.2.4.15"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.4"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz"; - hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; - } - { - version = "8.3.3.40"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz"; - hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; - } - { - version = "8.3.3.40"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.6"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz"; - hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; - } - { - version = "8.4.1.50"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz"; - hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; - } - { - version = "8.4.1.50"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.7"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz"; - hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; - } - { - version = "8.5.0.96"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz"; - hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; - } - { - version = "8.5.0.96"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.7"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz"; - hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; - } - { - version = "8.6.0.163"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz"; - hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; - } - { - version = "8.6.0.163"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz"; - hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; - } - { - version = "8.7.0.84"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz"; - hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; - } - { - version = "8.7.0.84"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda11-archive.tar.xz"; - hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920="; - } - { - version = "8.8.1.3"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda11-archive.tar.xz"; - hash = "sha256-r3WEyuDMVSS1kT7wjCm6YVQRPGDrCjegWQqRtRWoqPk="; - } - { - version = "8.8.1.3"; - minCudaVersion = "12.0"; - maxCudaVersion = "12.0"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda12-archive.tar.xz"; - hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w="; - } - { - version = "8.9.6.50"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda11-archive.tar.xz"; - hash = "sha256-oOLvVemfTNZH99HaqlqkUE/6M1ujAYbVwyiPL0ffBX4="; - } - { - version = "8.9.6.50"; - minCudaVersion = "12.0"; - maxCudaVersion = "12.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz"; - hash = "sha256-FyIlnblSZbs4E0OKWhxuzZed6JrkU2YDkEBC4STTAtU="; - } -] diff --git a/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix deleted file mode 100644 index c957fcdd99d4..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, lib -, libPath -, cudatoolkit -, fetchurl -, autoPatchelfHook -, addOpenGLRunpath - -, version -, hash -}: - -let - mostOfVersion = builtins.concatStringsSep "." - (lib.take 3 (lib.versions.splitVersion version)); - platform = "${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}"; -in - -stdenv.mkDerivation { - pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor"; - inherit version; - - src = fetchurl { - url = if lib.versionOlder mostOfVersion "1.3.3" - then "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${platform}-${version}.tar.gz" - else "https://developer.download.nvidia.com/compute/cutensor/redist/libcutensor/${platform}/libcutensor-${platform}-${version}-archive.tar.xz"; - inherit hash; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - autoPatchelfHook - addOpenGLRunpath - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - installPhase = '' - mkdir -p "$out" "$dev" - mv include "$dev" - mv ${libPath} "$out/lib" - - function finalRPathFixups { - for lib in $out/lib/lib*.so; do - addOpenGLRunpath $lib - done - } - postFixupHooks+=(finalRPathFixups) - ''; - - passthru = { - inherit cudatoolkit; - majorVersion = lib.versions.major version; - }; - - meta = with lib; { - description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; - homepage = "https://developer.nvidia.com/cutensor"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ obsidian-systems-maintenance ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix index 21e6cbf858cd..25ac539e05f2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -6,8 +6,6 @@ , cmake , cudaPackages ? { } , cudaSupport ? config.cudaSupport -, nvidia-thrust -, useThrustSourceBuild ? true , pythonSupport ? true , pythonPackages , llvmPackages @@ -27,8 +25,6 @@ , runCommand }@inputs: -assert cudaSupport -> nvidia-thrust.cudaSupport; - let pname = "faiss"; version = "1.7.4"; @@ -44,9 +40,6 @@ let cuda_cudart # cuda_runtime.h libcublas libcurand - ] ++ lib.optionals useThrustSourceBuild [ - nvidia-thrust - ] ++ lib.optionals (!useThrustSourceBuild) [ cuda_cccl ] ++ lib.optionals (cudaPackages ? cuda_profiler_api) [ cuda_profiler_api # cuda_profiler_api.h diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix deleted file mode 100644 index d1df26456447..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, backendStdenv -, fetchFromGitHub -, python3 -, which -, autoAddOpenGLRunpathHook -, cuda_cccl -, cuda_cudart -, cuda_nvcc -, cudaFlags -, cudaVersion -# passthru.updateScript -, gitUpdater -}: -let - # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" - gencode = lib.concatStringsSep " " cudaFlags.gencode; -in -backendStdenv.mkDerivation (finalAttrs: { - pname = "nccl"; - version = "2.19.3-1"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - which - autoAddOpenGLRunpathHook - cuda_nvcc - python3 - ]; - - buildInputs = [ - cuda_cudart - ] - # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons - # against other version, like below, it's important that we use the same format. Otherwise, - # we'll get incorrect results. - # For example, lib.versionAtLeast "12.0" "12.0.0" == false. - ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl - ]; - - preConfigure = '' - patchShebangs ./src/device/generate.py - makeFlagsArray+=( - "NVCC_GENCODE=${gencode}" - ) - ''; - - makeFlags = [ - "CUDA_HOME=${cuda_nvcc}" - "CUDA_LIB=${lib.getLib cuda_cudart}/lib" - "CUDA_INC=${lib.getDev cuda_cudart}/include" - "PREFIX=$(out)" - ]; - - postFixup = '' - moveToOutput lib/libnccl_static.a $dev - ''; - - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; - - # Run the update script with: `nix-shell maintainers/scripts/update.nix --argstr package cudaPackages.nccl` - passthru.updateScript = gitUpdater { - inherit (finalAttrs) pname version; - rev-prefix = "v"; - }; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; - homepage = "https://developer.nvidia.com/nccl"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix deleted file mode 100644 index 9d826b92f164..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ backendStdenv -, config -, cuda_cccl -, cuda_cudart -, cuda_nvcc -, cudaVersion -, fetchFromGitHub -, gitUpdater -, lib -, mpi -, mpiSupport ? false -, nccl -, which -}: - -backendStdenv.mkDerivation (finalAttrs: { - - pname = "nccl-tests"; - version = "2.13.8"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cuda_nvcc - which - ]; - - buildInputs = [ - cuda_cudart - nccl - ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl.dev # <nv/target> - ] ++ lib.optional mpiSupport mpi; - - makeFlags = [ - "CUDA_HOME=${cuda_nvcc}" - "NCCL_HOME=${nccl}" - ] ++ lib.optionals mpiSupport [ - "MPI=1" - ]; - - enableParallelBuilding = true; - - installPhase = '' - mkdir -p $out/bin - cp -r build/* $out/bin/ - ''; - - passthru.updateScript = gitUpdater { - inherit (finalAttrs) pname version; - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; - homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = platforms.linux; - license = licenses.bsd3; - broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 3fc533e848db..c5b9f9019e06 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.24"; + version = "0.3.25"; outputs = [ "out" "dev" ]; @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; + hash = "sha256-eY/R7gLDOls3csuwZkUS+x+v3GeL3dCsOD+4STxDpCg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index dd2eb9478f7f..abc2ff9a3701 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -8,7 +8,7 @@ , mpfr , config , enableCuda ? config.cudaSupport -, cudatoolkit +, cudaPackages }: stdenv.mkDerivation rec { @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + ]; # Use compatible indexing for lapack and blas used buildInputs = assert (blas.isILP64 == lapack.isILP64); [ @@ -34,7 +38,12 @@ stdenv.mkDerivation rec { gfortran.cc.lib gmp mpfr - ] ++ lib.optional enableCuda cudatoolkit; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart.dev + cudaPackages.cuda_cudart.lib + cudaPackages.libcublas.dev + cudaPackages.libcublas.lib + ]; preConfigure = '' # Mongoose and GraphBLAS are packaged separately @@ -49,9 +58,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" ] ++ lib.optionals enableCuda [ - "CUDA_PATH=${cudatoolkit}" - "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" - "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" + "CUDA_PATH=${cudaPackages.cuda_nvcc}" + "CUDART_LIB=${cudaPackages.cuda_cudart.lib}/lib/libcudart.so" + "CUBLAS_LIB=${cudaPackages.libcublas.lib}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch deleted file mode 100644 index 6fa3c703efa9..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28103856e..a36909c0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -449,13 +449,6 @@ install(FILES - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel - ) - --if(EIGEN_BUILD_PKGCONFIG) -- configure_file(eigen3.pc.in eigen3.pc @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc -- DESTINATION ${PKGCONFIG_INSTALL_DIR} -- ) --endif() -- - install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) - - add_subdirectory(doc EXCLUDE_FROM_ALL) -@@ -570,8 +563,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) - set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) - set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) - set ( EIGEN_DEFINITIONS "") --set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) - set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) -+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) -+ -+if(EIGEN_BUILD_PKGCONFIG) -+ configure_file(eigen3.pc.in eigen3.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc -+ DESTINATION ${PKGCONFIG_INSTALL_DIR} -+ ) -+endif() - - # Interface libraries require at least CMake 3.0 - if (NOT CMAKE_VERSION VERSION_LESS 3.0) -diff --git a/eigen3.pc.in b/eigen3.pc.in -index 3368a3aa1..d6778bf06 100644 ---- a/eigen3.pc.in -+++ b/eigen3.pc.in -@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r - Requires: - Version: @EIGEN_VERSION_NUMBER@ - Libs: --Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ -+Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix index b4018c6cc284..ffd9b672684c 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -17,16 +17,32 @@ final: prev: let isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; # Return the first file that is supported. In practice there should only ever be one anyway. supportedFile = files: findFirst isSupported null files; - # Supported versions with versions as keys and file as value - supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) tensorRTVersions); + # Compute versioned attribute name to be used in this package set computeName = version: "tensorrt_${toUnderscore version}"; + + # Supported versions with versions as keys and file as value + supportedVersions = lib.recursiveUpdate + { + tensorrt = { + enable = false; + fileVersionCuda = null; + fileVersionCudnn = null; + fullVersion = "0.0.0"; + sha256 = null; + tarball = null; + supportedCudaVersions = [ ]; + }; + } + (mapAttrs' (version: attrs: nameValuePair (computeName version) attrs) + (filterAttrs (version: file: file != null) (mapAttrs (version: files: supportedFile files) tensorRTVersions))); + # Add all supported builds as attributes - allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions; + allBuilds = mapAttrs (name: file: buildTensorRTPackage (removeAttrs file ["fileVersionCuda"])) supportedVersions; + # Set the default attributes, e.g. tensorrt = tensorrt_8_4; - defaultBuild = { "tensorrt" = if allBuilds ? ${computeName tensorRTDefaultVersion} - then allBuilds.${computeName tensorRTDefaultVersion} - else throw "tensorrt-${tensorRTDefaultVersion} does not support your cuda version ${cudaVersion}"; }; + defaultName = computeName tensorRTDefaultVersion; + defaultBuild = lib.optionalAttrs (allBuilds ? ${defaultName}) { tensorrt = allBuilds.${computeName tensorRTDefaultVersion}; }; in { inherit buildTensorRTPackage; } // allBuilds // defaultBuild; diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix deleted file mode 100644 index 165c6f356da8..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, backendStdenv -, requireFile -, autoPatchelfHook -, autoAddOpenGLRunpathHook -, cudaVersion -, cudatoolkit -, cudnn -}: - -{ fullVersion -, fileVersionCudnn ? null -, tarball -, sha256 -, supportedCudaVersions ? [ ] -}: - -assert fileVersionCudnn == null || lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) - "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; - -backendStdenv.mkDerivation rec { - pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; - version = fullVersion; - src = requireFile rec { - name = tarball; - inherit sha256; - message = '' - To use the TensorRT derivation, you must join the NVIDIA Developer Program and - download the ${version} Linux x86_64 TAR package for CUDA ${cudaVersion} from - ${meta.homepage}. - - Once you have downloaded the file, add it to the store with the following - command, and try building this derivation again. - - $ nix-store --add-fixed sha256 ${name} - ''; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - autoPatchelfHook - autoAddOpenGLRunpathHook - ]; - - # Used by autoPatchelfHook - buildInputs = [ - backendStdenv.cc.cc.lib # libstdc++ - cudatoolkit - cudnn - ]; - - sourceRoot = "TensorRT-${version}"; - - installPhase = '' - install --directory "$dev" "$out" - mv include "$dev" - mv targets/x86_64-linux-gnu/lib "$out" - install -D --target-directory="$out/bin" targets/x86_64-linux-gnu/bin/trtexec - ''; - - # Tell autoPatchelf about runtime dependencies. - # (postFixup phase is run before autoPatchelfHook.) - postFixup = - let - mostOfVersion = builtins.concatStringsSep "." - (lib.take 3 (lib.versions.splitVersion version)); - in - '' - echo 'Patching RPATH of libnvinfer libs' - patchelf --debug --add-needed libnvinfer.so \ - "$out/lib/libnvinfer.so.${mostOfVersion}" \ - "$out/lib/libnvinfer_plugin.so.${mostOfVersion}" \ - "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" - ''; - - passthru.stdenv = backendStdenv; - - meta = with lib; { - # Check that the cudatoolkit version satisfies our min/max constraints (both - # inclusive). We mark the package as broken if it fails to satisfies the - # official version constraints (as recorded in default.nix). In some cases - # you _may_ be able to smudge version constraints, just know that you're - # embarking into unknown and unsupported territory when doing so. - broken = !(elem cudaVersion supportedCudaVersions); - description = "TensorRT: a high-performance deep learning interface"; - homepage = "https://developer.nvidia.com/tensorrt"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ aidalgol ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index d046c6864539..2036c4c86253 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -14,10 +14,15 @@ inherit (cudaPackages) backendStdenv cudaFlags; cuda-common-redist = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcusparse # cusparse.h + cuda_cudart.dev # cuda_runtime.h + cuda_cudart.lib + cuda_cccl.dev # <nv/target> + libcublas.dev # cublas_v2.h + libcublas.lib + libcusolver.dev # cusolverDn.h + libcusolver.lib + libcusparse.dev # cusparse.h + libcusparse.lib ]; cuda-native-redist = symlinkJoin { diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index 5e7358fa15f9..ec44d80d04a8 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { # https://github.com/silnrsi/graphite/pull/74 substituteInPlace tests/CMakeLists.txt \ --replace 'add_subdirectory(nametabletest)' '#add_subdirectory(nametabletest)' + + # support cross-compilation by using target readelf binary: + substituteInPlace Graphite.cmake \ + --replace 'readelf' "${stdenv.cc.targetPrefix}readelf" ''; cmakeFlags = lib.optionals static [ diff --git a/nixpkgs/pkgs/development/libraries/sord/default.nix b/nixpkgs/pkgs/development/libraries/sord/default.nix index 54ae9261f810..6ce3ca60c0f5 100644 --- a/nixpkgs/pkgs/development/libraries/sord/default.nix +++ b/nixpkgs/pkgs/development/libraries/sord/default.nix @@ -4,21 +4,22 @@ , fetchFromGitHub , meson , ninja -, pcre +, pcre2 , pkg-config , python3 , serd +, zix }: stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.14"; + version = "0.16.16"; src = fetchFromGitHub { owner = "drobilla"; repo = pname; rev = "v${version}"; - hash = "sha256-S22Szpg6iXeana5t6EpbOtRstthgrJ4Z2cBrf7a9ZBk="; + hash = "sha256-GDs1m8KoEhJDdCf7kacQMZzCNPoZhESJds6KupQvOkU="; }; outputs = [ "out" "dev" "doc" "man" ]; @@ -30,8 +31,8 @@ stdenv.mkDerivation rec { pkg-config python3 ]; - buildInputs = [ pcre ]; - propagatedBuildInputs = [ serd ]; + buildInputs = [ pcre2 ]; + propagatedBuildInputs = [ serd zix ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/spglib/default.nix b/nixpkgs/pkgs/development/libraries/spglib/default.nix index 73de0a287cba..724a9f52d509 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.1.0"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.2.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; + hash = "sha256-VaTW7n7DTeYBr/PrxPhfzfx/gLxzJikw5aL1tEbMtbs="; }; nativeBuildInputs = [ cmake gfortran gtest ]; diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix index 4abaced42ae2..16c1e461ec5e 100644 --- a/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - hash = "sha256-qTu0vS9K6rrr/0SXKpGC9P1QSN/AN7hyO/4DrGvhxWM="; + hash = "sha256-TB6wZnPZ16k8N8r0F6x+363zlTCJbM4HsKLvMZy1uYA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/tcllib/default.nix b/nixpkgs/pkgs/development/libraries/tcllib/default.nix index cd087045a8a3..a5bfba8b0559 100644 --- a/nixpkgs/pkgs/development/libraries/tcllib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tcllib/default.nix @@ -1,14 +1,23 @@ -{ lib, fetchurl, tcl }: +{ lib +, fetchzip +, tcl +, critcl +, withCritcl ? true +}: tcl.mkTclDerivation rec { pname = "tcllib"; version = "1.21"; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "sha256-RrK7XsgEk2OuAWRa8RvaO9tdsQYp6AfYHRrUbNG+rVA="; + hash = "sha256-p8thpRpC+9k/LvbBFaSOIpDXuhMlEWhs0qbrjtKcTzQ="; }; + nativeBuildInputs = lib.optional withCritcl critcl; + + buildFlags = [ "all" ] ++ lib.optional withCritcl "critcl"; + meta = { homepage = "https://core.tcl-lang.org/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 575aef5ba4f3..f1c1c85caf0b 100644 --- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.21"; + version = "1.8.22"; 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 = "3870c29b158b75ca5e48e0eebd6b5c3a7994a000"; - hash = "sha256-MCzgovcEZa34ZkwbbwfXHm2qitHwL2Tpr8p7+PxNhYk="; + rev = "24893faf75d84b2b885f3f7aeb9d5a3c056fa7be"; + hash = "sha256-4cfnre71+rQSuPrtFJMzIEPYVCZH/W142b4Pn2NxvqI="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/ucc/default.nix b/nixpkgs/pkgs/development/libraries/ucc/default.nix index a92c6bea37d7..68f358b3d3de 100644 --- a/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx , config , enableCuda ? config.cudaSupport -, cudatoolkit +, cudaPackages , enableAvx ? stdenv.hostPlatform.avxSupport , enableSse41 ? stdenv.hostPlatform.sse4_1Support , enableSse42 ? stdenv.hostPlatform.sse4_2Support @@ -30,19 +30,25 @@ stdenv.mkDerivation rec { done ''; + nativeBuildInputs = [ libtool automake autoconf ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; + buildInputs = [ ucx ] + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cccl + cudaPackages.cuda_cudart + ]; + + preConfigure = '' ./autogen.sh + '' + lib.optionalString enableCuda '' + configureFlagsArray+=( "--with-nvcc-gencode=${builtins.concatStringsSep " " cudaPackages.cudaFlags.gencode}" ) ''; - - nativeBuildInputs = [ libtool automake autoconf ]; - buildInputs = [ ucx ] - ++ lib.optional enableCuda cudatoolkit; - configureFlags = [ ] ++ lib.optional enableSse41 "--with-sse41" ++ lib.optional enableSse42 "--with-sse42" ++ lib.optional enableAvx "--with-avx" - ++ lib.optional enableCuda "--with-cuda=${cudatoolkit}"; + ++ lib.optional enableCuda "--with-cuda=${cudaPackages.cuda_cudart}"; postInstall = '' find $out/lib/ -name "*.la" -exec rm -f \{} \; diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix index 627cac56bb73..3b923d8efdd2 100644 --- a/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -2,18 +2,12 @@ , rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config , config , enableCuda ? config.cudaSupport -, cudatoolkit +, cudaPackages , enableRocm ? config.rocmSupport , rocmPackages }: let - # Needed for configure to find all libraries - cudatoolkit' = symlinkJoin { - inherit (cudatoolkit) name meta; - paths = [ cudatoolkit cudatoolkit.lib ]; - }; - rocmList = with rocmPackages; [ rocm-core rocm-runtime rocm-device-libs clr ]; rocm = symlinkJoin { @@ -35,7 +29,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "dev" ]; - nativeBuildInputs = [ autoreconfHook doxygen pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + ] + ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + cudaPackages.autoAddOpenGLRunpathHook + ]; buildInputs = [ libbfd @@ -44,8 +46,16 @@ stdenv.mkDerivation rec { perl rdma-core zlib - ] ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals enableRocm rocmList; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + cudaPackages.cuda_nvml_dev + + ] ++ lib.optionals enableRocm rocmList; + + LDFLAGS = lib.optionals enableCuda [ + # Fake libnvidia-ml.so (the real one is deployed impurely) + "-L${cudaPackages.cuda_nvml_dev}/lib/stubs" + ]; configureFlags = [ "--with-rdmacm=${lib.getDev rdma-core}" @@ -53,7 +63,7 @@ stdenv.mkDerivation rec { "--with-rc" "--with-dm" "--with-verbs=${lib.getDev rdma-core}" - ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}" + ] ++ lib.optionals enableCuda [ "--with-cuda=${cudaPackages.cuda_cudart}" ] ++ lib.optional enableRocm "--with-rocm=${rocm}"; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/uri/default.nix b/nixpkgs/pkgs/development/libraries/uri/default.nix index 51c2bcd59a57..039db9392671 100644 --- a/nixpkgs/pkgs/development/libraries/uri/default.nix +++ b/nixpkgs/pkgs/development/libraries/uri/default.nix @@ -11,12 +11,15 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=parentheses" # Needed with GCC 12 "-Wno-error=deprecated-declarations" "-Wno-error=nonnull" - ]; + ] ++ lib.optionals stdenv.cc.isClang [ + # Needed with Clang 16 + "-Wno-error=deprecated-builtins" + ]); nativeBuildInputs = [ cmake doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 163cea7565c0..068c1d3d2c2a 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ vulkan-headers ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; + ++ lib.optionals stdenv.isLinux [ libX11 libxcb libXrandr wayland ]; cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; license = licenses.asl20; maintainers = [ maintainers.ralith ]; broken = (version != vulkan-headers.version); diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 8192dded7e4c..c5bf837b3dac 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.42.2"; + version = "2.42.3"; 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" ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-VyCqPoYn8bn2MlIYfU3w+CM65x1pexeW6/vlynUL0Rg="; + hash = "sha256-ChpGMARWKLOm/pXactxHhSz/INZr4axv0NZpyIwT2OI="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix index c05fcef2557a..13052747eb5e 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, curl , gst_all_1 , gtk3 , libGL @@ -14,6 +15,8 @@ , compat28 ? false , compat30 ? true , unicode ? true +, withCurl ? false +, withPrivateFonts ? false , withEGL ? true , withMesa ? !stdenv.isDarwin , withWebKit ? stdenv.isDarwin @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { libXxf86vm xorgproto ] + ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit @@ -85,6 +89,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withEGL) "--disable-glcanvasegl" ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withCurl "--enable-webrequest" + ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.isDarwin [ "--with-osx_cocoa" diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index e5ca1fc58edc..90fe559c3cf4 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -1,6 +1,10 @@ -{ stdenv, lib, fetchFromGitLab, fetchpatch, nasm +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, nasm , enableShared ? !stdenv.hostPlatform.isStatic - }: +}: stdenv.mkDerivation rec { pname = "x264"; @@ -49,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H264/AVC video streams"; - homepage = "http://www.videolan.org/developers/x264.html"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + homepage = "http://www.videolan.org/developers/x264.html"; + license = licenses.gpl2Plus; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ tadeokondrak ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index e760151f216a..905675c40659 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -117,6 +117,12 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' # For test_trash_file export HOME=$(mktemp -d) + + # Upstream disables a few tests in CI upstream as they are known to + # be flaky. Let's disable those downstream as hydra exhibits similar + # flakes: + # https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951 + export TEST_IN_CI=1 ''; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/xeus/default.nix b/nixpkgs/pkgs/development/libraries/xeus/default.nix index 172fd0e73578..1ea5ec49170d 100644 --- a/nixpkgs/pkgs/development/libraries/xeus/default.nix +++ b/nixpkgs/pkgs/development/libraries/xeus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xeus"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = pname; rev = version; - sha256 = "sha256-kGIVcsgLG6weNfBwgEVTMa8NA9MXSztzi9ML5/gDqAQ="; + sha256 = "sha256-1QaMACLqTWC74V7l2LHLUMN/s/N4kNrE7+Ny1wkbavs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xsimd/default.nix b/nixpkgs/pkgs/development/libraries/xsimd/default.nix index 8b53db0388fe..3a9a90fbe2bc 100644 --- a/nixpkgs/pkgs/development/libraries/xsimd/default.nix +++ b/nixpkgs/pkgs/development/libraries/xsimd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; - version = "11.1.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = finalAttrs.version; - sha256 = "sha256-l6IRzndjb95hIcFCCm8zmlNHWtKduqy2t/oml/9Xp+w="; + sha256 = "sha256-CzgfxXGZXoJ56dX+mDPsHZC31YudrZXpX2tovh/Vjr0="; }; patches = [ # Ideally, Accelerate/Accelerate.h should be used for this implementation, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + "-DBUILD_TESTS=${if (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/xsimd/disable-exp10-test.patch b/nixpkgs/pkgs/development/libraries/xsimd/disable-exp10-test.patch index 62e24e18c6b7..8d2940c3b080 100644 --- a/nixpkgs/pkgs/development/libraries/xsimd/disable-exp10-test.patch +++ b/nixpkgs/pkgs/development/libraries/xsimd/disable-exp10-test.patch @@ -4,23 +4,25 @@ Date: Tue Aug 1 13:26:04 2023 +0300 Darwin & Musl: Disable failing exp10 test -diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp -index 84b4b0b..1b29742 100644 --- a/test/test_xsimd_api.cpp +++ b/test/test_xsimd_api.cpp -@@ -515,11 +515,6 @@ struct xsimd_api_float_types_functions +@@ -515,15 +515,6 @@ struct xsimd_api_float_types_functions value_type val(2); CHECK_EQ(extract(xsimd::exp(T(val))), std::exp(val)); } - void test_exp10() - { - value_type val(2); +-#ifdef EMSCRIPTEN +- CHECK_EQ(extract(xsimd::exp10(T(val))), doctest::Approx(std::pow(value_type(10), val))); +-#else - CHECK_EQ(extract(xsimd::exp10(T(val))), std::pow(value_type(10), val)); +-#endif - } void test_exp2() { value_type val(2); -@@ -804,11 +799,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) +@@ -813,11 +804,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) Test.test_exp(); } diff --git a/nixpkgs/pkgs/development/libraries/xsimd/disable-polar-test.patch b/nixpkgs/pkgs/development/libraries/xsimd/disable-polar-test.patch index cbb7c0313c6d..91128f43c2d5 100644 --- a/nixpkgs/pkgs/development/libraries/xsimd/disable-polar-test.patch +++ b/nixpkgs/pkgs/development/libraries/xsimd/disable-polar-test.patch @@ -4,11 +4,9 @@ Date: Tue Aug 1 13:29:16 2023 +0300 aarch64-Darwin: Disable failing polar test -diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp -index 1b29742..03c6b4b 100644 --- a/test/test_xsimd_api.cpp +++ b/test/test_xsimd_api.cpp -@@ -652,12 +652,6 @@ struct xsimd_api_float_types_functions +@@ -661,17 +661,6 @@ struct xsimd_api_float_types_functions value_type val1(4); CHECK_EQ(extract(xsimd::nextafter(T(val0), T(val1))), std::nextafter(val0, val1)); } @@ -16,12 +14,17 @@ index 1b29742..03c6b4b 100644 - { - value_type val0(3); - value_type val1(4); +-#ifndef EMSCRIPTEN - CHECK_EQ(extract(xsimd::polar(T(val0), T(val1))), std::polar(val0, val1)); +-#else +- CHECK_EQ(std::real(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::real(std::polar(val0, val1)))); +- CHECK_EQ(std::imag(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::imag(std::polar(val0, val1)))); +-#endif - } void test_pow() { value_type val0(2); -@@ -912,11 +906,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) +@@ -931,11 +920,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) Test.test_nextafter(); } diff --git a/nixpkgs/pkgs/development/libraries/xtensor/default.nix b/nixpkgs/pkgs/development/libraries/xtensor/default.nix index bb01b7f875ea..678f87af74cf 100644 --- a/nixpkgs/pkgs/development/libraries/xtensor/default.nix +++ b/nixpkgs/pkgs/development/libraries/xtensor/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = let cmakeBool = x: if x then "ON" else "OFF"; in [ - "-DBUILD_TESTS=${cmakeBool finalAttrs.doCheck}" + "-DBUILD_TESTS=${cmakeBool finalAttrs.finalPackage.doCheck}" "-DXTENSOR_ENABLE_ASSERT=${cmakeBool enableAssertions}" "-DXTENSOR_CHECK_DIMENSION=${cmakeBool enableBoundChecks}" ]; diff --git a/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch b/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch deleted file mode 100644 index cd51d17b1500..000000000000 --- a/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1c6b32d..aa7dd25 100644 ---- a/meson.build -+++ b/meson.build -@@ -58,10 +58,10 @@ endif - - # argp-standalone dependency (if required) - if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') -- if fs.is_dir(join_paths([get_option('prefix'), 'include'])) -- inc += include_directories(join_paths([get_option('prefix'), 'include'])) -+ argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) -+ if not argplib.found() -+ argplib = dependency('argp-standalone') - endif -- argplib = cc.find_library('argp', dirs : join_paths([get_option('prefix'), 'lib'])) - else - argplib = dependency('', required : false) - endif diff --git a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index 6a0e173db3a9..2a4119e0fe22 100644 --- a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { branch = "4"; homepage = "http://www.zeromq.org"; diff --git a/nixpkgs/pkgs/development/libraries/zlog/default.nix b/nixpkgs/pkgs/development/libraries/zlog/default.nix index e67b8ee336ed..4baa18b9d46f 100644 --- a/nixpkgs/pkgs/development/libraries/zlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlog/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.2.16"; + version = "1.2.17"; pname = "zlog"; src = fetchFromGitHub { owner = "HardySimpson"; repo = pname; rev = version; - sha256 = "sha256-wpaMbFKSwTIFe3p65pMJ6Pf2qKp1uYZCyyinGU4AxrQ="; + sha256 = "sha256-ckpDMRLxObpl8N539DC5u2bPpmD7jM+KugurUfta6tg="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; |