diff options
Diffstat (limited to 'pkgs/development/libraries')
25 files changed, 145 insertions, 125 deletions
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 3de4ed8e774..45dceb39345 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -43,6 +43,13 @@ 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/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index fa170ba2b96..7a57315a5f4 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.26"; + version = "0.7.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-PvdkTw5JydJT0TbXLB2C9tk4T+ho+fAbaw4jU9m5KuU="; + sha256 = "sha256-DzUobQ8qZNb83CwVKK9E1V51uHHo22nlBGKdN55W7UY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 3abca937806..a76ee7ab003 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.21"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WMCLVwRrgwFsaqoKtbQNt0bHVYi1LUZt5r0i3oAfWFE="; + sha256 = "sha256-qsYQViMto5j6piCg6gBjzFfPJlLkJt4949o217QsV6Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 93ac1df0465..1df8bef5be1 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.8.15"; + version = "0.8.23"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AemFZZwfHdjqX/sXUw1fpusICOa3C7rT6Ofsz5bGYOQ="; + sha256 = "sha256-HkRaQnlasayg5Nu2KaEA18360rxAH/tdJ1iqzoi6i2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index ecbd7238ced..cc486bc3e6d 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-compression"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-compression"; rev = "v${version}"; - sha256 = "sha256-aQ5UsMms8aJh5yrE9of1AQgIGTAk9vyBRaybwYqUY68="; + sha256 = "sha256-XtmSThfz4Cu7CygYrLNQifDCQ6l/c/0OR0lX+OxCYJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index fb857a3f316..6b3c8af43f5 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.20"; + version = "0.3.1"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UDACkGqTtyLablSzePMmMk4iGpgfdtZU/SEv0RCSFfA="; + sha256 = "sha256-2MPTr1vSUPuemdlQIalZTp6eGXJl3Xr1eUEnZjikBzg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 8cb2703147e..045f5f97a80 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.7.6"; + version = "0.7.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-pJGzGbIuz8UJkfmTQEZgXSOMuYixMezNZmgaRlcnmfg="; + sha256 = "sha256-gKuWhXxWHqTS66yANdKLsCZRk7jeDmyYMlme4WXT5Wc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 041edf2a522..e1eb1939c21 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.19"; + version = "0.13.29"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6lTAnoBWbwyWpycsaS7dpCC9c4xYws19HCNyTd7aRho="; + sha256 = "sha256-ZeogbjgpbqdCioLeb34CRol1Fa5BJOloAxxgE50yfQs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 5f3fda00c52..082887ee3a3 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.8"; + version = "0.8.14"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-bt5Qjw+CqgTfi/Ibhc4AwmJxr22Q6m3ygpmeMhvQTT0="; + sha256 = "sha256-LPhd4ygh/3BtqDZwWtigXWUGZ0fzkcWkFl6dpJIspow="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 97c7083c669..ca07b930109 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.2.8"; + version = "0.3.13"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-kwYzsKdEy+e0GxqYcakcdwoaC2LLPZe8E7bZNrmqok0="; + sha256 = "sha256-SXMDyzQ8hjPx9q9GhE11lYjj3IZY35mvUWELlYQmgGU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index ed931a1190a..df43976e6cf 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.9"; + version = "0.1.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-iKHO8awWWB8tvYCr+/R6hhK8a/PnanYYEAJ7zNOJC3w="; + sha256 = "sha256-xwPMuaaKzypxJK9mTKD4tJZjzl19pu60seGtS2QFjgI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index bfbc163c162..722c77f32de 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.14"; + version = "0.1.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yoViXJuM9UQMcn8W0CcWkCXroBLXjAestr+oqWHi5hQ="; + sha256 = "sha256-OoEwubEEkLJmlqmQR4/rp4+b1WYJEbcjYDSdXXHleZQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 5928b5eaf8c..0f44dab59db 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.20.2"; + version = "0.20.3"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-6oRVAL4pn+1+/LqLijKiBV6fZy3k9fZySwMwYHB1aUY="; + sha256 = "sha256-70AchkuhuyumwpBYaj9mOVPJ8+6VSLTLtr3ghwqG3wM="; }; patches = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 68ea4412283..24b1dc681f0 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.11.37"; + version = "1.11.118"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-C1PdLNagoIMk9/AAV2Pp7kWcspasJtN9Tx679FnEprc="; + sha256 = "sha256-jqGXh8xLD2gIjV9kSvlldrxA5TxTTXQoC/B66FVprvk="; }; patches = [ diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index cad0f3aaed6..5de26ef5ce2 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -134,6 +134,14 @@ stdenv.mkDerivation { relative = "include"; hash = "sha256-dq4SVgxkPJSC7Fvr59VGnXkM4Lb09kYDaBksCHo9C0s="; }) + # This fixes an issue in Python 3.11 about Py_TPFLAGS_HAVE_GC + (fetchpatch { + name = "python311-compatibility.patch"; + url = "https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013.patch"; + hash = "sha256-IHxLtJBx0xSy7QEr8FbCPofsjcPuSYzgtPwDlx1JM+4="; + stripLen = 1; + extraPrefix = "libs/python/"; + }) ]; meta = with lib; { diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index 877296334fe..a25ca5b97df 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -9,26 +9,18 @@ , python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "loco-3d"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-wDHCHTJXmJjU7mhQ2huUVdEc9ap7PMeqlHPrKm//jBQ="; + hash = "sha256-h7rzLSvmWOZCP8rvmUEhFeMEiPhojfbvkt+fNKpgoXo="; }; - patches = [ - # error: no matching function for call to 'max(double&, int)' - (fetchpatch { - url = "https://github.com/loco-3d/crocoddyl/commit/d2e4116257595317740975e745739bb76b92e5c0.patch"; - hash = "sha256-M79jNdIxzx9PfW3TStRny76dVo/HDf/Rp08ZPx+ymBg"; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -48,11 +40,26 @@ stdenv.mkDerivation rec { "-DBUILD_PYTHON_INTERFACE=OFF" ]; + prePatch = '' + substituteInPlace \ + examples/CMakeLists.txt \ + examples/log/check_logfiles.sh \ + --replace /bin/bash ${stdenv.shell} + ''; + + doCheck = true; + pythonImportsCheck = [ + "crocoddyl" + ]; + checkInputs = lib.optionals (pythonSupport) [ + python3Packages.scipy + ]; + meta = with lib; { description = "Crocoddyl optimal control library"; homepage = "https://github.com/loco-3d/crocoddyl"; license = licenses.bsd3; - maintainers = with maintainers; [ wegank ]; + maintainers = with maintainers; [ nim65s wegank ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index b8ec7227c61..201275fb02e 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -6,16 +6,16 @@ , python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "example-robot-data"; - version = "4.0.7"; + version = "4.0.8"; src = fetchFromGitHub { owner = "Gepetto"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-dN23ukKPkTohqD1J/0EneLyG6Cg0zriMr1l6WLFemd8="; + hash = "sha256-xeNbx1f9QCAOJrXfkk3jo9XH2/4HNtnRA1OSnqA2cLs="; }; strictDeps = true; @@ -32,11 +32,16 @@ stdenv.mkDerivation rec { "-DBUILD_PYTHON_INTERFACE=OFF" ]; + doCheck = true; + pythonImportsCheck = [ + "example_robot_data" + ]; + meta = with lib; { description = "Set of robot URDFs for benchmarking and developed examples."; homepage = "https://github.com/Gepetto/example-robot-data"; license = licenses.bsd3; - maintainers = with maintainers; [ wegank ]; + maintainers = with maintainers; [ nim65s wegank ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index f4eac39919f..59ab572762e 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, alsa-lib, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, fetchpatch +, libpulseaudio +, audioBackend ? "pulseaudio" +}: + +assert lib.assertOneOf "audioBackend" audioBackend [ "alsa" "pulseaudio" ]; stdenv.mkDerivation rec { pname = "flite"; @@ -11,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ]; + buildInputs = lib.optional (stdenv.isLinux && audioBackend == "alsa") alsa-lib + ++ lib.optional (stdenv.isLinux && audioBackend == "pulseaudio") libpulseaudio; # https://github.com/festvox/flite/pull/60. # Replaces `ar` with `$(AR)` in config/common_make_rules. @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; + ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop @@ -35,6 +45,7 @@ stdenv.mkDerivation rec { description = "A small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ getchoo ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index bab58c887e5..6af608995c2 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-JaV4Wl2jVmiQAUQJJrlOln0C4TxJ63dD417wzyLkJ1A="; + hash = "sha256-QW4XThZXNNhIBiU/jJa9opk/0H8ljDqtXwU6bv1GPog="; }; patches = [ diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 3d7b6ff9e01..ff7cefa5267 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.6.4"; + version = "1.7.0"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0="; + hash = "sha256-3ZVBGd2T5DQKsDEc5a7pS0yz01+rDCszU9ZK0zxvfyQ="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9974826573a..6542fdfb14f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -141,18 +141,19 @@ stdenv.mkDerivation (finalAttrs: { ''; # Not generated when cross compiling. - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' - # Merge gdkpixbuf and librsvg loaders - cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp - mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache - - mkdir -p "$out/share/bash-completion/completions/" - $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" - mkdir -p "$out/share/zsh/site-functions/" - $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" - mkdir -p "$out/share/fish/vendor_completions.d/" - $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" - ''; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + # Merge gdkpixbuf and librsvg loaders + cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp + mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + + mkdir -p "$out/share/bash-completion/completions/" + ${emulator} $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + mkdir -p "$out/share/zsh/site-functions/" + ${emulator} $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + mkdir -p "$out/share/fish/vendor_completions.d/" + ${emulator} $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" + ''; postFixup = lib.optionalString withIntrospection '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 75649eabaed..392786524a8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -86,8 +86,8 @@ */ let - version = "23.1.3"; - hash = "sha256-L21zgbwQ+9LWJjrRAieFuLURBGwakEFi+PfaGO6ortk="; + version = "23.1.4"; + hash = "sha256-cmGhf7lIZ+PcWpDYofEA+gSwy73lHSUwLAhytemhCVk="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 7f545958e71..11499231007 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,17 +1,16 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook -, docbook-xsl-nons -, gtk-doc -, installShellFiles -, libxslt # for xsltproc +, meson +, ninja , pkg-config -, which +, libtasn1 +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gettext , libffi -, libiconv , libintl -, libtasn1 }: stdenv.mkDerivation rec { @@ -25,65 +24,47 @@ stdenv.mkDerivation rec { hash = "sha256-paLiRYgYshuedgDgW2nEsv4/Loq6qFyQMjfBJwqtHzw="; }; - outputs = [ "out" "bin" "dev"]; + outputs = [ "out" "bin" "dev" ]; + + strictDeps = true; - # For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs - # provides the asn1Parser binary on the hostPlatform needed for building. - # at the same time, libtasn1 in buildInputs provides the libasn1 library - # to link against for the target platform. - # Hence, libtasn1 is required in both native and build inputs. nativeBuildInputs = [ - autoreconfHook - docbook-xsl-nons - gtk-doc - installShellFiles - libtasn1 - libxslt.bin + meson + ninja pkg-config - which + libtasn1 # asn1Parser + libxslt # xsltproc + docbook-xsl-nons + docbook_xml_dtd_43 + gettext ]; buildInputs = [ libffi - libiconv - libintl libtasn1 + libintl ]; - autoreconfPhase = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - configureFlags = [ - "--enable-doc" + mesonFlags = [ "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-trust-paths=${lib.concatStringsSep ":" [ - "/etc/ssl/trust-source" # p11-kit trust source - "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... - "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS + (lib.mesonBool "man" true) + (lib.mesonEnable "systemd" false) + (lib.mesonOption "bashcompdir" "${placeholder "bin"}/share/bash-completion/completions") + (lib.mesonOption "trust_paths" (lib.concatStringsSep ":" [ + "/etc/ssl/trust-source" # p11-kit trust source + "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... + "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS "/var/lib/ca-certificates/ca-bundle.pem" # openSUSE - "/etc/ssl/cert.pem" # Darwin/macOS - ]}" + "/etc/ssl/cert.pem" # Darwin/macOS + ])) ]; - enableParallelBuilding = true; - - # Tests run in fakeroot for non-root users - preCheck = '' - if [ "$(id -u)" != "0" ]; then - export FAKED_MODE=1 - fi - ''; - - doCheck = !stdenv.isDarwin; - - installFlags = [ - "exampledir=${placeholder "out"}/etc/pkcs11" - ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - postInstall = '' - installShellCompletion --bash bash-completion/{p11-kit,trust} + postPatch = '' + # Install sample config files to $out/etc even though they will be loaded from /etc. + substituteInPlace p11-kit/meson.build \ + --replace 'install_dir: prefix / p11_system_config' "install_dir: '$out/etc/pkcs11'" ''; meta = with lib; { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3f58975cf3b..584fc7d5ecc 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.74"; + version = "0.3.75"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-ZV66niKeR4PDaqUuVqiosY7LSDLmIjrDsmCZyQkR72Y="; + sha256 = "sha256-2irYbRmJi/+6Ap0G8dfC/pwh0Ql19srMVsw8CnfTsDY="; }; patches = [ diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 7655c4db254..dd68fef04e6 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.46"; + version = "1.3.47"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X+ZwM53ensCeUoxNa8cBO4KcWxWbb7iKxIRysImvKxw="; + sha256 = "sha256-wFn7vJA6FCfgFCjjDdyOtBv209yeJNFlG1fKMQ84Bj0="; }; nativeBuildInputs = [ cmake ]; |