diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
102 files changed, 822 insertions, 329 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index aa1cd1d809f0..4c8c7ed8f435 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.28.1"; + version = "2.28.2"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-SXfOulwAVNvmwvEUZBrO1DzjvytB6mS2o3LWuhKcsV0="; + hash = "sha256-ZLEQL6Igk1FbAu8z3Yc53uG6V+nbumoJKUK4u+0aHF4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index ac97871d9ca1..772650bd3a8a 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -36,14 +36,21 @@ stdenv.mkDerivation rec { patches = [ # CVE-2021-36217 / CVE-2021-3502 (fetchpatch { + name = "CVE-2021-3502.patch"; url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch"; sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU="; }) # CVE-2021-3468 (fetchpatch { + name = "CVE-2021-3468.patch"; url = "https://github.com/lathiat/avahi/commit/447affe29991ee99c6b9732fc5f2c1048a611d3b.patch"; sha256 = "sha256-qWaCU1ZkCg2PmijNto7t8E3pYRN/36/9FrG8okd6Gu8="; }) + (fetchpatch { + name = "CVE-2023-1981.patch"; + url = "https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f.patch"; + sha256 = "sha256-BEYFGCnQngp+OpiKIY/oaKygX7isAnxJpUPCUvg+efc="; + }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index c618a2ee3b5b..85c785be3cb3 100644 --- a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-jpNsH8c5ObnO+/AqsribvyFZhm7mmCFGNx9p4QHZKQE="; + sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/azmq/default.nix b/nixpkgs/pkgs/development/libraries/azmq/default.nix new file mode 100644 index 000000000000..7317c51aabde --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/azmq/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, ninja +, zeromq +, catch2 +}: + +stdenv.mkDerivation { + pname = "azmq"; + version = "unstable-2023-03-23"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "azmq"; + rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf"; + hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + boost + catch2 + zeromq + ]; + + # Broken for some reason on this platform. + doCheck = !(stdenv.isAarch64 && stdenv.isLinux); + + meta = with lib; { + homepage = "https://github.com/zeromq/azmq"; + license = licenses.boost; + description = "C++ language binding library integrating ZeroMQ with Boost Asio"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix index eb0ea3c94b28..0b6cd66cae38 100644 --- a/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.2.12"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; + sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA="; }; buildInputs = [ bctoolbox belr ]; diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index a48b6f4fa7f5..b8201f8ce5c6 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit curl grpc; + inherit grpc; + curl = (curl.override { c-aresSupport = true; }).tests.withCheck; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix index 0d236c36aa3c..82d591abc139 100644 --- a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "${finalAttrs.src.name}/library/"; + sourceRoot = "${finalAttrs.src.name}/library"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index ec108adc61eb..003de885c791 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gfortran, perl -, mpi, blas, lapack, scalapack, openssh +{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook +, gfortran, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; - nativeBuildInputs = [ autoreconfHook perl openssh ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] ++ lib.optional enableCuda cudatoolkit; @@ -76,15 +76,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' #patchShebangs ./ - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - # Run dual threaded export OMP_NUM_THREADS=2 diff --git a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix index 84513d20a57a..71077d6e315e 100644 --- a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix +++ b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + enableParallelBuilding = true; + configureFlags = lib.optional exampleSupport "--enable-example"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index cd9e99b352eb..b42fdbd60ccb 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.3.18"; + version = "1.3.20"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HYVh1XxxmRoo9GgTQ3hcI6aj61TVvNI4l9B+OCX/LVY="; + sha256 = "sha256-IK4R87gG5PvA+gtZMftHO7V0i+6dSH9qoSiFCDV4pe0="; }; buildInputs = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; + changelog = "https://github.com/FreeTDS/freetds/releases/tag/v${version}"; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/futuresql/default.nix b/nixpkgs/pkgs/development/libraries/futuresql/default.nix new file mode 100644 index 000000000000..2adc148701a7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/futuresql/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }: +stdenv.mkDerivation rec { + pname = "futuresql"; + version = "0.1.1"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtbase ]; + + # a library, nothing to wrap + dontWrapQtApps = true; +} diff --git a/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch b/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch new file mode 100644 index 000000000000..eea9dc6e0378 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch @@ -0,0 +1,32 @@ +From 1e000ca711886055176a2f90197a383d09de0e67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + <rosen644835@gmail.com> +Date: Fri, 18 Dec 2020 14:19:36 +0100 +Subject: [PATCH] msginit: Do not use POT-Creation-Date. + +* gettext-tools/src/msginit.c (po_revision_date): Do not use +POT-Creation-Date when the file is automatically generated. +--- + gettext-tools/src/msginit.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c +index 8ca9a3b77..06e0e7195 100644 +--- a/gettext-tools/src/msginit.c ++++ b/gettext-tools/src/msginit.c +@@ -1075,9 +1075,9 @@ static const char * + po_revision_date (const char *header) + { + if (no_translator) +- /* Because the PO file is automatically generated, we use the +- POT-Creation-Date, not the current time. */ +- return get_field (header, "POT-Creation-Date"); ++ /* Because the PO file is automatically generated, we don't ++ generate PO-Revision-Date field. */ ++ return NULL; + else + { + /* Assume the translator will modify the PO file now. */ +-- +2.29.2 + diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 9230c27a3c1f..dc4af0813918 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff + # fix reproducibile output, in particular in the grub2 build + # https://savannah.gnu.org/bugs/index.php?59658 + ./0001-msginit-Do-not-use-POT-Creation-Date.patch ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; name = "gettext_formatstring-ruby.patch"; diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix index a64bb0967aa7..53377022ad69 100644 --- a/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -19,24 +19,50 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + # glog's custom FindUnwind.cmake module detects LLVM's unwind in case + # stdenv.cc is clang. But the module doesn't get installed, causing + # consumers of the CMake config file to fail at the configuration step. + # Explicitly disabling unwind support sidesteps the issue. + "-DWITH_UNWIND=OFF" ]; - # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed - doCheck = !stdenv.isDarwin; + doCheck = true; + # There are some non-thread safe tests that can fail enableParallelChecking = false; nativeCheckInputs = [ perl ]; - GTEST_FILTER = + env.GTEST_FILTER = let filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ "Symbolize.SymbolizeStackConsumption" "Symbolize.SymbolizeWithDemanglingStackConsumption" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ] ++ lib.optionals stdenv.cc.isClang [ + # Clang optimizes an expected allocation away. + # See https://github.com/google/glog/issues/937 + "DeathNoAllocNewHook.logging" + ] ++ lib.optionals stdenv.isDarwin [ + "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ]; + in + "-${builtins.concatStringsSep ":" filteredTests}"; + + checkPhase = + let + excludedTests = lib.optionals stdenv.isDarwin [ + "mock-log" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "logging" # works around segfaults on aarch64-darwin for now ]; + excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; in - lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}"; + '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; meta = with lib; { homepage = "https://github.com/google/glog"; diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 75a20bbbc355..2b088eb459ad 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -23,9 +23,29 @@ in stdenv.mkDerivation { pname = "gnu-config"; version = "2023-07-31"; - buildCommand = '' - install -Dm755 ${configGuess} $out/config.guess - install -Dm755 ${configSub} $out/config.sub + unpackPhase = '' + runHook preUnpack + cp ${configGuess} ./config.guess + cp ${configSub} ./config.sub + chmod +w ./config.sub ./config.guess + runHook postUnpack + ''; + + # If this isn't set, `pkgs.gnu-config.overrideAttrs( _: { patches + # = ...; })` will behave very counterintuitively: the (unpatched) + # gnu-config from the updateAutotoolsGnuConfigScriptsHook stdenv's + # defaultNativeBuildInputs will "update" the patched gnu-config by + # reverting the patch! + dontUpdateAutotoolsGnuConfigScripts = true; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 ./config.guess $out/config.guess + install -Dm755 ./config.sub $out/config.sub + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index b04d5966a5a9..2bfde78f7dbc 100644 --- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -41,6 +41,15 @@ stdenv.mkDerivation (finalAttrs: { --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" ''; + doCheck = true; + checkPhase = '' + runHook preCheck + + bin/unit-hyperscan + + runHook postCheck + ''; + meta = with lib; { description = "High-performance multiple regex matching library"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index c0e20ba7f594..69f25fd79c83 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -24,19 +24,19 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "igraph"; version = "0.10.6"; src = fetchFromGitHub { owner = "igraph"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE="; }; postPatch = '' - echo "${version}" > IGRAPH_VERSION + echo "${finalAttrs.version}" > IGRAPH_VERSION ''; outputs = [ "out" "dev" "doc" ]; @@ -95,9 +95,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library for complex network analysis and graph theory"; homepage = "https://igraph.org/"; - changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index ba9a0610bde0..4ed5cc06cf0a 100644 --- a/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.7"; + version = "1.89.8"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs="; + sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix index 022f68a9d351..113c377240b4 100644 --- a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Work around the "unpacker appears to have produced no directories" - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 73bbe1782b7f..d9064ee85d17 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-4"; + version = "6.0-5"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA="; + sha256 = "sha256-pKmR+IVJAaY91KiboCBkwZleMmMFToez1fW+eXyrZjs="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/nixpkgs/pkgs/development/libraries/kcp/default.nix b/nixpkgs/pkgs/development/libraries/kcp/default.nix new file mode 100644 index 000000000000..69a2b91553e4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kcp/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "kcp"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "kcp"; + rev = version; + hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A Fast and Reliable ARQ Protocol"; + homepage = "https://github.com/skywind3000/kcp"; + license = licenses.mit; + maintainers = with maintainers; [ rs0vere ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index 5ab33fcf46fd..f9aa5dc369c6 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -4,12 +4,12 @@ , fetchpatch , extra-cmake-modules , qtbase -, qttranslations , kcoreaddons , python3 , sqlite , postgresql , libmysqlclient +, qttools }: mkDerivation rec { @@ -34,9 +34,9 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qttranslations kcoreaddons python3 sqlite postgresql libmysqlclient ]; + buildInputs = [ kcoreaddons python3 sqlite postgresql libmysqlclient ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 281a490bf90a..a47182fda5e5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,8 +1,8 @@ -{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }: +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qtgraphicaleffects, qttools }: mkDerivation { pname = "kirigami2"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; outputs = [ "out" "dev" ]; } diff --git a/nixpkgs/pkgs/development/libraries/lcrq/default.nix b/nixpkgs/pkgs/development/libraries/lcrq/default.nix index 91a8e2e30f5b..865ec4697326 100644 --- a/nixpkgs/pkgs/development/libraries/lcrq/default.nix +++ b/nixpkgs/pkgs/development/libraries/lcrq/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "lcrq"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; - hash = "sha256-GvfmHST53qwVrztnmCzUVbVkgNGtAl5adqdNWOHItiU="; + hash = "sha256-r4UiZ9oNDxF3rHMqg+1NLLjm6LPZtzgtZOs7pRe5SdQ="; }; installFlags = [ "PREFIX=$(out)" ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://librecast.net/lcrq.html"; license = [ lib.licenses.gpl2 lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ]; - platforms = lib.platforms.gnu; + platforms = lib.platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index c8f050c300ce..de305474a3ab 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -30,7 +30,7 @@ let autoreconfHook = buildPackages.autoreconfHook269; in assert xarSupport -> libxml2 != null; -(stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; version = "3.6.2"; @@ -43,6 +43,16 @@ assert xarSupport -> libxml2 != null; outputs = [ "out" "lib" "dev" ]; + patches = [ + # fixes static linking; upstream in releases after 3.6.2 + # https://github.com/libarchive/libarchive/pull/1825 merged upstream + (assert finalAttrs.version == "3.6.2"; fetchpatch { + name = "001-only-add-iconv-to-pc-file-if-needed.patch"; + url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; + hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + }) + ]; + postPatch = let skipTestPaths = [ # test won't work in nix sandbox @@ -119,16 +129,4 @@ assert xarSupport -> libxml2 != null; passthru.tests = { inherit cmake nix samba; }; -})).overrideAttrs(previousAttrs: - assert previousAttrs.version == "3.6.2"; - lib.optionalAttrs stdenv.hostPlatform.isStatic { - patches = [ - # fixes static linking; upstream in releases after 3.6.2 - # https://github.com/libarchive/libarchive/pull/1825 merged upstream - (fetchpatch { - name = "001-only-add-iconv-to-pc-file-if-needed.patch"; - url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; - hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; - }) - ]; - }) +}) diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix index ba24182ade80..fe1b789fc42f 100644 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q="; + sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 38a62255b15e..b9d31c6fd874 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0iqih0fbafzlcfq3kljjr3pkywamwvahgm6b7b0z0xdbzq0idxdx"; - platforms."x86_64-linux".sha256 = "1cc7lmp984653b9909pnk4brs96bmgq7hd6p9i6xgxy2y4n3887m"; + platforms."aarch64-linux".sha256 = "0ij7y0whlq8g1sskbhirbw3ngbp95k1in2pi9kjhb9flydjwxq8g"; + platforms."x86_64-linux".sha256 = "0dyv1ddsakxi51a7iwmy006mx27gvjq49i45difkmjv6mw9s2fw9"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.14"; - gitRevision = "376a780"; - chromiumVersion = "116.0.5845.97"; + version = "116.0.15"; + gitRevision = "0b8c265"; + chromiumVersion = "116.0.5845.111"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/libcint/default.nix b/nixpkgs/pkgs/development/libraries/libcint/default.nix index 7163c312ea92..e90078b0c840 100644 --- a/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.2.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-sFdigOlS5fAi2dV4dhcPg3roqFdvpnh580WDqTA6DGg="; + hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index faf9029b8fc7..95d1474c1fbe 100644 --- a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-EPVz9+qEuJe4VGXNuUnbH61EDxdyohZhxoxleO5j/Uk="; + sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 9cf19fa3d312..49c3713bbe0e 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.15.0"; + version = "3.16.0"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-CNHBPeodU2EzvmQBa9KI+1vGuuD25gSwdU9dVhVG04Q="; + hash = "sha256-XgObeVQJ2X7hNIelGK55RTtkKvU6D+RkLMc24/PZCzY="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index e3f9d82d1a81..7b7721197f82 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/libgourou/default.nix b/nixpkgs/pkgs/development/libraries/libgourou/default.nix index 2d1b90675590..78b5654873bd 100644 --- a/nixpkgs/pkgs/development/libraries/libgourou/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgourou/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchzip, pugixml, updfparser, curl, openssl, libzip -, installShellFiles }: +{ lib +, stdenv +, fetchzip +, pugixml +, updfparser +, curl +, openssl +, libzip +, installShellFiles +}: stdenv.mkDerivation rec { name = "libgourou"; - version = "0.8.1"; + version = "0.8.2"; src = fetchzip { url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/"; - sha256 = "sha256-X56K4z1+k62Q9pxnN8kx35oc7+uJJN/o/tpnKx1FjwE="; + sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix index 44367aad1f93..c3fb4a053864 100644 --- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisoburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI="; + sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs="; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/nixpkgs/pkgs/development/libraries/liblc3/default.nix index 3e27e4064c59..f2ec852d3bf0 100644 --- a/nixpkgs/pkgs/development/libraries/liblc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblc3/default.nix @@ -7,7 +7,7 @@ let name = "liblc3"; - version = "1.0.3"; + version = "1.0.4"; in stdenv.mkDerivation { pname = name; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-PEnK12FWAtxOMR3WyuxOQTgF+lD9S5YX+oKuWRbFfXM="; + sha256 = "sha256-nQJgF/cWoCx5TkX4xOaLB9SzvhVXPY29bLh7UwPMWEE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index a74c4e7140fa..edbaf20690ff 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.06"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-xrGuiyu89AM0BRizyU8q51yOsAaCv7vRiyJELkLcz80="; + hash = "sha256-YEVsiyq4dppggdlv176G20/jJSDkoCI5fLIsrPR86CA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index c6e787eda618..4807c1c55142 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "40"; + version = "41"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-4wPKe8D1lOLWqoT2h4VCPmvwyNrQCbsgvk1XQliOiQ0="; + hash = "sha256-HOIZOV0vUMM+siOhQD+DGLFo8ebRAVp9udv0OUCN6MQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix index 37043e3e4bde..d1ea44b6ac2f 100644 --- a/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -9,6 +9,16 @@ , pkg-config , withBluez ? false , withRemote ? false + +# for passthru.tests +, ettercap +, nmap +, ostinato +, tcpreplay +, vde2 +, wireshark +, python3 +, haskellPackages }: stdenv.mkDerivation rec { @@ -44,6 +54,12 @@ stdenv.mkDerivation rec { fi ''; + passthru.tests = { + inherit ettercap nmap ostinato tcpreplay vde2 wireshark; + inherit (python3.pkgs) pcapy-ng scapy; + haskell-pcap = haskellPackages.pcap; + }; + meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index b84562850efe..a8826e4381eb 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU="; + sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix index 26d7616ba8f0..b03be435aac5 100644 --- a/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, lcms2 +, pkg-config + +# for passthru.tests +, deepin +, freeimage +, hdrmerge +, imagemagick +, python3 +}: stdenv.mkDerivation rec { pname = "libraw"; @@ -11,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-1729.patch"; + url = "https://github.com/LibRaw/LibRaw/commit/9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch"; + hash = "sha256-OAyqphxvtSM15NI77HwtGTmTmP9YNu3xhZ6D1CceJ7I="; + }) + ]; + outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; @@ -19,6 +41,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit imagemagick hdrmerge freeimage; + inherit (deepin) deepin-image-viewer; + inherit (python3.pkgs) rawkit; + }; + meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index d81a31ce05c4..d5738153f0ab 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -29,6 +29,16 @@ , common-updater-scripts , jq , nix + +# for passthru.tests +, enlightenment +, ffmpeg +, gegl +, gimp +, imagemagick +, imlib2 +, vips +, xfce }: stdenv.mkDerivation (finalAttrs: { @@ -193,6 +203,17 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + tests = { + inherit + gegl + gimp + imagemagick + imlib2 + vips; + inherit (enlightenment) efl; + inherit (xfce) xfwm4; + ffmpeg = ffmpeg.override { withSvg = true; }; + }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index 0dc795a96d84..7c6613873f3a 100644 --- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-zd0HDUzVYLyFjhIudBJQaKJUtYMjZeQRLALSkyD9tXU="; + hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI="; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix index 0a1e1e7f0a21..a1fe567af8b1 100644 --- a/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-01-03${lib.optionalString with_ustream_ssl "-${ustream-ssl.ssl_implementation.pname}"}"; + version = "unstable-2023-05-23"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "eac92a4d5d82eb31e712157e7eb425af728b2c43"; - sha256 = "0w6mmwmd3ljhkqfk0qswq28dp63k30s3brlgf8lyi7vj7mrhvn3c"; + rev = "75a3b870cace1171faf57bd55e5a9a2f1564f757"; + hash = "sha256-QhJ09i7IWP6rbxrYuhisVsCr82Ou/JAZMEdkaLhZp1o="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 0f1757f4e618..5779389dda1b 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, fetchpatch }: stdenv.mkDerivation rec { pname = "liburing"; @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; }; + patches = [ + # Pull upstream fix for parallel build failures: + # https://github.com/axboe/liburing/pull/891 + (fetchpatch { + name = "parallel.patch"; + url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; + hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; + }) + ]; + separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index 9a78bc4422c7..9102286746b6 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.80"; + version = "2.1.111"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-3Lf8JUnzD20Xq6UswCbcWpgEBs0z4OEo7CGt0vWiPhI="; + sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix index 12ac860320c7..ecc3736d1fbb 100644 --- a/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" ]; - sourceRoot = "./ZenLib/Project/GNU/Library/"; + sourceRoot = "ZenLib/Project/GNU/Library"; preConfigure = "sh autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix index e7e8d2032ed5..44f82f15852a 100644 --- a/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , python , cmake +, ninja }: let - pyEnv = python.withPackages (ps: [ ps.setuptools ]); + pyEnv = python.withPackages (ps: [ ps.setuptools ps.tomli ps.pip ps.setuptools ]); in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.3"; + version = "0.13.2"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY="; + sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg="; }; outputs = [ "out" "py" ]; nativeBuildInputs = [ cmake + ninja ]; # Not a propagatedBuildInput because only the $py output needs it; $out is @@ -31,33 +33,16 @@ stdenv.mkDerivation rec { python ]; - dontUseCmakeConfigure = true; - - buildPhase = '' - runHook preBuild - - substituteInPlace setup.py \ - --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]" - ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES - - runHook postBuild + postBuild = '' + pushd /build/source/api/python + ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES + popd ''; - # I was unable to find a way to build the library itself and have it install - # to $out, while also installing the Python bindings to $py without building - # the project twice (using cmake), so this is the best we've got. It uses - # something called CPack to create the tarball, but it's not obvious to me - # *how* that happens, or how to intercept it to just get the structured - # library output. - installPhase = '' - runHook preInstall - - mkdir -p $out $py/nix-support - echo "${python}" >> $py/nix-support/propagated-build-inputs - tar xf build/*.tar.gz --directory $out --strip-components 1 + postInstall = '' + pushd /build/source/api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py - - runHook postInstall + popd ''; meta = with lib; { @@ -65,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.lassulus ]; + maintainers = with maintainers; [ lassulus genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix index d3e3187bf757..6ab138016d19 100644 --- a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL libX11 libXi ]; - sourceRoot = "liquidfun/Box2D/"; + sourceRoot = "liquidfun/Box2D"; preConfigurePhases = "preConfigure"; diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index 1c08812db45c..b583eb93153a 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + enableParallelBuilding = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index f19672e566d1..05341188be6c 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 = "0.13.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; + hash = "sha256-FkiqQZ6xmwU2vkJxmr7k+Va5jIByWayAfUea+2DCFhk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index b4330796e52c..8badbf9e8760 100644 --- a/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs nss - for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do + for f in nss/coreconf/config.gypi nss/build.sh; do substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" done diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix index fd47a05a1bc9..8851b09214f1 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "2.7.1"; + version = "2.7.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ alexarice bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index f7495d3e9c8c..7448a99439d0 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; version = "3.2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 99e45c1013d1..1b955b57de42 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -132,6 +132,7 @@ stdenv.mkDerivation rec { cmakeDir = "../cmake"; cmakeFlags = [ + "-DABSL_ENABLE_INSTALL=ON" "-DCMAKE_BUILD_TYPE=RELEASE" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" @@ -143,6 +144,7 @@ stdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" "-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}" "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}" + "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}" "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" diff --git a/nixpkgs/pkgs/development/libraries/openturns/default.nix b/nixpkgs/pkgs/development/libraries/openturns/default.nix index 4c80c4b9ac81..d6735e77d460 100644 --- a/nixpkgs/pkgs/development/libraries/openturns/default.nix +++ b/nixpkgs/pkgs/development/libraries/openturns/default.nix @@ -26,24 +26,15 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A="; + sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; }; - patches = [ - # Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187 - # Remove with next version update. - (fetchpatch { - url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch"; - hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE="; - }) - ]; - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; buildInputs = [ swig @@ -84,6 +75,7 @@ stdenv.mkDerivation rec { description = "Multivariate probabilistic modeling and uncertainty treatment library"; license = with licenses; [ lgpl3 gpl3 ]; homepage = "https://openturns.github.io/www/"; + changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; maintainers = with maintainers; [ gdinh ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 08b92288e544..941d4da56894 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.77"; + version = "0.3.78"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-dRAo/GzWvXKVCGLM12YyTQmgXHEYn3QbOyaZKmlqTYY="; + sha256 = "sha256-tiVuab8kugp9ZOKL/m8uZQps/pcrVihwB3rRf6SGuzc="; }; patches = [ @@ -221,7 +221,7 @@ let moveToOutput "bin/pw-jack" "$jack" ''; - passthru.tests = nixosTests.installed-tests.pipewire; + passthru.tests.installed-tests = nixosTests.installed-tests.pipewire; meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; diff --git a/nixpkgs/pkgs/development/libraries/plog/default.nix b/nixpkgs/pkgs/development/libraries/plog/default.nix index 789502283b7f..45b0fa49a1ab 100644 --- a/nixpkgs/pkgs/development/libraries/plog/default.nix +++ b/nixpkgs/pkgs/development/libraries/plog/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "plog"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "SergiusTheBest"; repo = pname; rev = version; - hash = "sha256-CARTr1EEqXNJtp6XwHhr7aiRBiYR0cClzexpNCMaQJc="; + hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 04fdf5298257..e6e6b24360a4 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -46,6 +46,7 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch + ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch @@ -333,7 +334,17 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "qt5"; - f = addPackages; -} + baseScope = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt5"; + f = addPackages; + }; + + bootstrapScope = baseScope.overrideScope(final: prev: { + qtbase = prev.qtbase.override { qttranslations = null; }; + qtdeclarative = null; + }); + + finalScope = baseScope.overrideScope(final: prev: { + qttranslations = bootstrapScope.qttranslations; + }); +in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch new file mode 100644 index 000000000000..e1aa0119aa2f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch @@ -0,0 +1,79 @@ +commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) +Author: K900 <me@0upti.me> +Date: Mon Aug 14 22:44:02 2023 +0300 + + QLibraryPrivate: Actually merge load hints + + Or old and new load hints in mergeLoadHints() instead of just storing + new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects + with no file name differently and just set load hints directly. + + Mention that load hints are merged once the file name is set + in the documentation for QLibrary::setLoadHints(). + + Add a regression test into tst_qfactoryloader. + + Update and extend tst_QPluginLoader::loadHints() to take into account + load hints merging. + + Fixes: QTBUG-114480 + Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 + Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp +index 5d2f024267..45b5a3fe27 100644 +--- a/src/corelib/plugin/qlibrary.cpp ++++ b/src/corelib/plugin/qlibrary.cpp +@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) + if (pHnd.loadRelaxed()) + return; + +- loadHintsInt.storeRelaxed(lh); ++ loadHintsInt.fetchAndOrRelaxed(lh); + } + + QFunctionPointer QLibraryPrivate::resolve(const char *symbol) +@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) + + void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) + { ++ // Set the load hints directly for a dummy if this object is not associated ++ // with a file. Such object is not shared between multiple instances. ++ if (fileName.isEmpty()) { ++ loadHintsInt.storeRelaxed(lh); ++ return; ++ } ++ + // this locks a global mutex + QMutexLocker lock(&qt_library_mutex); + mergeLoadHints(lh); +@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const + lazy symbol resolution, and will not export external symbols for resolution + in other dynamically-loaded libraries. + ++ \note Hints can only be cleared when this object is not associated with a ++ file. Hints can only be added once the file name is set (\a hints will ++ be or'ed with the old hints). ++ + \note Setting this property after the library has been loaded has no effect + and loadHints() will not reflect those changes. + +diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp +index 0a63b93762..ceee5d6385 100644 +--- a/src/corelib/plugin/qpluginloader.cpp ++++ b/src/corelib/plugin/qpluginloader.cpp +@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const + void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) + { + if (!d) { +- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr ++ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr + d->errorString.clear(); ++ } else { ++ d->setLoadHints(loadHints); + } +- d->setLoadHints(loadHints); + } + + QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index de73bcbe2772..9f0feaf94e58 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -15,6 +15,7 @@ # optional dependencies , cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 +, qttranslations ? null # options , libGLSupported ? !stdenv.isDarwin @@ -310,6 +311,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" + ] ++ lib.optional (qttranslations != null) [ + "-translationdir" "${qttranslations}/translations" ] ); diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index be96236d7285..bac70d146bf9 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -36,7 +36,7 @@ qtModule { "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix index f49a4eb9a85d..bcd52cdc4a8f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix @@ -2,5 +2,6 @@ qtModule { pname = "qttranslations"; - qtInputs = [ qttools ]; + nativeBuildInputs = [ qttools ]; + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 9abd9fabc957..bddbf254c5f7 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -17,7 +17,7 @@ mkDerivation (args // { patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index d90834e0b3e2..0a4fbe713ec0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -48,6 +48,7 @@ let ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch + ./patches/0008-qtbase-allow-translations-outside-prefix.patch ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -171,6 +172,14 @@ let # TODO(@Artturin): convert to makeScopeWithSplicing' # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 - self = lib.makeScope newScope addPackages; -in -self + baseScope = lib.makeScope newScope addPackages; + + bootstrapScope = baseScope.overrideScope'(final: prev: { + qtbase = prev.qtbase.override { qttranslations = null; }; + qtdeclarative = null; + }); + + finalScope = baseScope.overrideScope'(final: prev: { + qttranslations = bootstrapScope.qttranslations; + }); +in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index 4a4ebb320757..c0a20503e64c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -93,6 +93,7 @@ , libGL , debug ? false , developerBuild ? false +, qttranslations ? null }: let @@ -233,7 +234,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" - ]; + ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix index 4795cd9e1bfe..61c642de1085 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix @@ -4,5 +4,6 @@ qtModule { pname = "qttranslations"; - qtInputs = [ qttools ]; + nativeBuildInputs = [ qttools ]; + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 0c243d4ba7a9..5d9aa71e8537 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -14,8 +14,6 @@ , python3 , which , nodejs -, qtbase -, perl , xorg , libXcursor , libXScrnSaver @@ -51,8 +49,6 @@ , systemd , pipewire , gn -, runCommand -, writeScriptBin , ffmpeg_4 , lib , stdenv @@ -60,10 +56,8 @@ , libxml2 , libxslt , lcms2 -, re2 , libkrb5 , mesa -, xkeyboard_config , enableProprietaryCodecs ? true # darwin , llvmPackages_14 @@ -135,7 +129,11 @@ qtModule { # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. ../patches/qtwebengine-xkb-includes.patch + ../patches/qtwebengine-link-pulseaudio.patch + + # Override locales install path so they go to QtWebEngine's $out + ../patches/qtwebengine-locales-path.patch ]; postPatch = '' @@ -225,7 +223,6 @@ qtModule { libxml2 libxslt lcms2 - re2 libevent ffmpeg_4 diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch new file mode 100644 index 000000000000..e96cbdbef11d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake +index b45ec1d208..05f69c131b 100644 +--- a/cmake/QtBuild.cmake ++++ b/cmake/QtBuild.cmake +@@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) + set(rel_path ".") + elseif(rel_path MATCHES "^\.\./") + # INSTALL_SYSCONFDIR is allowed to be outside the prefix. +- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") ++ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) + message(FATAL_ERROR + "Path component '${name}' is outside computed install prefix: ${rel_path} ") + return() diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch new file mode 100644 index 000000000000..58f2d96f8097 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch @@ -0,0 +1,28 @@ +diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt +index f860e0ba7..30e1a767a 100644 +--- a/src/core/api/CMakeLists.txt ++++ b/src/core/api/CMakeLists.txt +@@ -193,7 +193,8 @@ if(QT_FEATURE_framework) + + else() + install(FILES ${localeFiles} +- DESTINATION ${INSTALL_TRANSLATIONSDIR}/qtwebengine_locales ++ # Nixpkgs: INSTALL_TRANSLATIONSDIR points to Qt base translations store path ++ DESTINATION ${INSTALL_DATADIR}/qtwebengine_locales + CONFIGURATIONS ${config} + ) + install(FILES ${resourceFiles} +diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp +index c03c9a3b2..430fdfab2 100644 +--- a/src/core/web_engine_library_info.cpp ++++ b/src/core/web_engine_library_info.cpp +@@ -203,7 +203,8 @@ QString localesPath() + candidatePaths << getResourcesPath(frameworkBundle()) % QDir::separator() + % QLatin1String("qtwebengine_locales"); + #endif +- candidatePaths << QLibraryInfo::path(QLibraryInfo::TranslationsPath) % QDir::separator() ++ // Nixpkgs: match the changes made in CMakeLists.txt ++ candidatePaths << QLibraryInfo::path(QLibraryInfo::DataPath) % QDir::separator() + % QLatin1String("qtwebengine_locales"); + candidatePaths << fallbackDir(); + } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix index 98606d24a968..ce917a274159 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); moveToDev = false; diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 0d9d1d42c0fb..64f3b81edde9 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -13,10 +13,14 @@ , qttools , wrapQtAppsHook , gitUpdater -}: +, qt5Kvantum ? null +}: +let + isQt6 = lib.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation rec { - pname = "qtstyleplugin-kvantum"; + pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; version = "1.0.10"; src = fetchFromGitHub { @@ -37,8 +41,8 @@ stdenv.mkDerivation rec { qtsvg libX11 libXext - ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] + ++ lib.optional isQt6 qtwayland; sourceRoot = "${src.name}/Kvantum"; @@ -57,6 +61,12 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + postInstall = lib.optionalString isQt6 '' + # make default Kvantum themes available for Qt 6 apps + mkdir -p "$out/share" + ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "V"; }; diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index 202035232399..adaef49976a7 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -8,23 +8,26 @@ , haskellPackages , mercurial , python3Packages +, abseil-cpp }: stdenv.mkDerivation rec { pname = "re2"; - version = "2023-03-01"; + version = "2023-08-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-T+P7qT8x5dXkLZAL8VjvqPD345sa6ALX1f5rflE0dwc="; + hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja ]; + propagatedBuildInputs = [ abseil-cpp ]; + postPatch = '' substituteInPlace re2Config.cmake.in \ --replace "\''${PACKAGE_PREFIX_DIR}/" "" @@ -65,7 +68,7 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; homepage = "https://github.com/google/re2"; - maintainers = with maintainers; [ azahi ]; + maintainers = with maintainers; [ azahi networkexception ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/rtlcss/default.nix b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix new file mode 100644 index 000000000000..a553e8d33ddf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix @@ -0,0 +1,24 @@ +{ buildNpmPackage, fetchFromGitHub, lib, ... }: + +buildNpmPackage rec { + pname = "rtlcss"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "MohammadYounes"; + repo = "rtlcss"; + rev = "v${version}"; + hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k="; + }; + + npmDepsHash = "sha256-ghVgvw55w7T9WxokYtlFSgCfGvcOxFzm2wQIFi+6uBY="; + + dontNpmBuild = true; + + meta = with lib; { + description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; + homepage = "https://rtlcss.com"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index dd68fef04e6b..678aac37e898 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.47"; + version = "1.3.48"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wFn7vJA6FCfgFCjjDdyOtBv209yeJNFlG1fKMQ84Bj0="; + sha256 = "sha256-7C1syZAhMv0N+AuE/SuXqhatKhlzDOix4ZDxLRyuWOs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index e0a6ffd9d547..db85bfdd9c0b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,6 +1,7 @@ { stdenv, backendStdenv, lib, + lndir, zlib, useCudatoolkitRunfile ? false, cudaVersion, @@ -10,14 +11,6 @@ autoPatchelfHook, autoAddOpenGLRunpathHook, fetchurl, - # The distributed version of CUDNN includes both dynamically liked .so files, - # as well as statically linked .a files. However, CUDNN is quite large - # (multiple gigabytes), so you can save some space in your nix store by - # removing the statically linked libraries if you are not using them. - # - # Setting this to true removes the statically linked .a files. - # Setting this to false keeps these statically linked .a files. - removeStatic ? false, }: { version, url, @@ -48,11 +41,16 @@ 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 = [ @@ -74,27 +72,49 @@ in # # 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 - cp -a include $out/include - [ -d "lib/" ] && cp -a lib $out/lib - [ -d "lib64/" ] && cp -a lib64 $out/lib64 - '' - + strings.optionalString removeStatic '' - rm -f $out/lib/*.a - rm -f $out/lib64/*.a - '' - + '' + 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 $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + 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 = { @@ -111,6 +131,19 @@ in 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 @@ -127,5 +160,8 @@ in license = licenses.unfree; 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/dbcsr/default.nix b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix index 5a9d3c5066cc..2c576a190026 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, mpiCheckPhaseHook , pkg-config , fypp , gfortran @@ -64,13 +65,12 @@ stdenv.mkDerivation rec { "-DUSE_MPI=ON" ]; - checkInputs = [ openssh ]; + checkInputs = [ + openssh + mpiCheckPhaseHook + ]; doCheck = true; - preCheck = '' - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 - ''; meta = with lib; { description = "Distributed Block Compressed Sparse Row matrix library"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 04f263568ce6..b3753a63339a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -113,13 +113,17 @@ stdenv.mkDerivation { lapack blas ] ++ lists.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - libcublas # cublas_v2.h - libcusparse # cusparse.h + cuda_cudart.dev # cuda_runtime.h + cuda_cudart.lib # cudart + cuda_cudart.static # cudart_static + libcublas.dev # cublas_v2.h + libcublas.lib # cublas + libcusparse.dev # cusparse.h + libcusparse.lib # cusparse ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # <cuda_profiler_api.h> + cuda_nvprof.dev # <cuda_profiler_api.h> ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # <cuda_profiler_api.h> + cuda_profiler_api.dev # <cuda_profiler_api.h> ]) ++ lists.optionals rocmSupport [ hip hipblas diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix index 029f418edce3..59f495d67109 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix @@ -36,8 +36,8 @@ ]; } { - version = "2.7.1"; - hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA="; + version = "2.7.2"; + hash = "sha256-cpvBpw5RinQi/no6VFN6R0EDWne+M0n2bqxcNiV21WA="; supportedGpuTargets = [ "700" "701" diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index 2eb391dda46b..c5c7b7e6427d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -8,20 +8,22 @@ , 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: { - name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}"; - version = "2.16.5-1"; + pname = "nccl"; + version = "2.18.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; - repo = "nccl"; + repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; + hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; }; outputs = [ "out" "dev" ]; @@ -63,6 +65,12 @@ backendStdenv.mkDerivation (finalAttrs: { 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; { diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 92588307ca57..55438c63a5e0 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ abseil-cpp protobuf - python.pkgs.protobuf + (python.pkgs.protobuf.override { protobuf = protobuf; }) python.pkgs.numpy ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix index fbd9db6a419f..bb5d212061f2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true , mpi, openssh, zlib @@ -47,10 +47,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; makeFlags = [ "V=0" ]; - preCheck = '' - export OMPI_MCA_rmaps_base_oversubscribe=1 - export HYDRA_IFACE=lo - ''; + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + openssh + ]; # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix index a55c5fe573bf..1218c695590e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ++ lib.optional withMetis "--with-metis" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck; + inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; meta = { branch = "prev3-develop"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 0d553376288f..e2a5e76c5586 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh -, mpi, blas, lapack +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +, openssh, mpiCheckPhaseHook, mpi, blas, lapack } : assert blas.isILP64 == lapack.isILP64; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; @@ -61,17 +61,6 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlagsArray = [ "ARGS=--timeout 10000" ]; - preCheck = '' - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - - # Run single threaded - export OMP_NUM_THREADS=1 - ''; - meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 1dc1a0214627..0e73ed979eba 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-+BCXkOaWYZSFWGZmeZ2ZJwVxFwmHgRbb7GSj/lRxmfw="; + sha256 = "sha256-h15IyPYvIUPDOJ03KgEDyRhXe0Oi8XCR5LnzSpPc4PI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix index a45d0a419e62..004dd388385f 100644 --- a/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -23,16 +23,17 @@ stdenv.mkDerivation rec { url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; }) + # Fix -Wsign-compare warning on clang. + (fetchpatch { + url = "https://github.com/google/snappy/commit/27f34a580be4a3becf5f8c0cba13433f53c21337.patch"; + sha256 = "sha256-eq6ueeMAkd2bYmPJcKAZZzd5QlXyeWOrsxFIwR8KOpQ="; + }) ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - # See https://github.com/NixOS/nixpkgs/pull/219778#issuecomment-1464884412 - # and https://github.com/NixOS/nixpkgs/pull/221215#issuecomment-1482564003. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-sign-compare"; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" "-DSNAPPY_BUILD_TESTS=OFF" diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index dc85ac20bf6a..44ad21d6a141 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.250.0"; + version = "1.3.261.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-5mVcbOAuzux/Yuo0NMwZRTsdQr46UxjrtMhT5mPHyCQ="; + hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 623a8dad04a9..05576b0dab14 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-n9KPtTj/mHXrnFJnbWPO3H+Vol3Z2mg7XLl55ynyLwY="; + hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix index c166d36d5a60..13f55a2dc52b 100644 --- a/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-CsImBz46LbhkjaevdEy5X1B2alL+6wAdVYsrMht0p2U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 575d8f4c4e0c..b3802c3a4514 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.10"; + version = "1.8.16"; 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 = "93c42f6d7c1209937431469f80427d48907f1b8d"; - hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4="; + rev = "cde095db6c75827fe4bd237039574aad373ad96b"; + hash = "sha256-m/RN6g0GxPiSvDZbiOaJFcT2j0K7sIaVGaxKWMVn6v8="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 163e35971a77..21c63f71221e 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -17,6 +17,7 @@ , gtest , doxygen , fixDarwinDylibNames +, useAVX2 ? stdenv.hostPlatform.avx2Support }: stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # unaccelerated routines. cmakeFlags = [ "-DTILEDB_WERROR=0" - ]; + ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ clang-tools diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 9d7cb73cc539..f637df891354 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { shadow ]; - # cmocka is checked / used(?) in the configure script + buildInputs = [ + openssl json_c curl libgcrypt uthash libuuid + ] + # cmocka is checked in the configure script # when unit and/or integration testing is enabled - buildInputs = [ openssl json_c curl libgcrypt uthash libuuid ] - # cmocka doesn't build with pkgsStatic, and we don't need it anyway - # when tests are not run - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - cmocka - ]; + # cmocka doesn't build with pkgsStatic, and we don't need it anyway + # when tests are not run + ++ lib.optional doInstallCheck cmocka; - nativeCheckInputs = [ + nativeInstallCheckInputs = [ cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 ]; @@ -70,27 +70,24 @@ stdenv.mkDerivation rec { --replace 'git describe --tags --always --dirty' 'echo "${version}"' ''; - configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + configureFlags = lib.optionals doInstallCheck [ "--enable-unit" "--enable-integration" ]; - doCheck = true; - preCheck = '' - # Since we rewrote the load path in the dynamic loader for the TCTI - # The various tcti implementation should be placed in their target directory - # before we could run tests - installPhase - # install already done, dont need another one - dontInstall=1 - ''; - postInstall = '' # Do not install the upstream udev rules, they rely on specific # users/groups which aren't guaranteed to exist on the system. rm -R $out/lib/udev ''; + doCheck = false; + doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + # Since we rewrote the load path in the dynamic loader for the TCTI + # The various tcti implementation should be placed in their target directory + # before we could run tests, so we make turn checkPhase into installCheckPhase + installCheckTarget = "check"; + meta = with lib; { description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; homepage = "https://github.com/tpm2-software/tpm2-tss"; diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix index 49aebdd7dca2..37c8a1fa450b 100644 --- a/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2021-02-15"; + version = "unstable-2023-06-05"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "2537be01858710e714c329153760c64fe3f8a73e"; - sha256 = "03ljxsn4w87bfrilccxhrkzqmd30hy6ihkvsinw0i3l7rpp5m4a7"; + rev = "f787c97b34894a38b15599886cacbca01271684f"; + hash = "sha256-PGPFtNaRXS6ryC+MA/w2CtPQfJa+vG5OXf/NPFMoIzQ="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix index c3e61e8d22a0..bbc4fcebdfc3 100644 --- a/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2021-04-14"; + version = "unstable-2023-08-10"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "4b3db1179747b6a6779029407984bacef851325c"; - sha256 = "1zflxazazzkrycpflzfg420kzp7kgy4dlz85cms279vk07dc1d52"; + rev = "5781664d5087ccc4b5ab58505883231212dbedbc"; + hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g="; }; hardeningDisable = [ "all" ]; diff --git a/nixpkgs/pkgs/development/libraries/uclient/default.nix b/nixpkgs/pkgs/development/libraries/uclient/default.nix index 458d726f2ca6..63a31c2bfbe9 100644 --- a/nixpkgs/pkgs/development/libraries/uclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/uclient/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uclient"; - version = "unstable-2022-02-24"; + version = "unstable-2023-04-13"; src = fetchgit { url = "https://git.openwrt.org/project/uclient.git"; - rev = "644d3c7e13c6a64bf5cb628137ee5bd4dada4b74"; - sha256 = "0vy4whs64699whp92d1zl7a8kh16yrfywqq0yp2y809l9z19sw22"; + rev = "007d945467499f43656b141171d31f5643b83a6c"; + hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix index 007ebc9c4573..76689da526d8 100644 --- a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "unstable-2022-12-08-${ssl_implementation.pname}"; + version = "unstable-2023-02-25"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "9217ab46536353c7c792951b57163063f5ec7a3b"; - sha256 = "1ldyyb3is213iljyccx98f56rb69rfpgdcb1kjxw9a176hvpipdd"; + rev = "498f6e268d4d2b0ad33b430f4ba1abe397d31496"; + hash = "sha256-qwF3pzJ/nUTaJ8NZtgLyXnSozekY3dovxK3ZWHPGORM="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix index 147248ee3461..c32c6e1e52f5 100644 --- a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4="; + sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/vkd3d/default.nix b/nixpkgs/pkgs/development/libraries/vkd3d/default.nix index 928cf2e78a23..77a275b20df5 100644 --- a/nixpkgs/pkgs/development/libraries/vkd3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.7.1"; + version = "1.8"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-4WUD6bRG/XwrOb5tl0ZyaaR0uy85eYXcb16eDeumOAQ="; + sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 7206fc1bc530..48e036ad030d 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.254"; + version = "1.3.261"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "v${version}"; - hash = "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A="; + hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; }; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh b/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh index b61be25ca2e7..7f6292ed23b7 100755 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh @@ -6,16 +6,17 @@ set -euf -o pipefail V_PACKAGES=( "vulkan-headers" "vulkan-loader" - "spirv-tools" "vulkan-validation-layers" "vulkan-tools" "vulkan-tools-lunarg" "vulkan-extension-layer" + "vulkan-utility-libraries" ) SDK_PACKAGES=( "spirv-headers" "spirv-cross" + "spirv-tools" ) nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index a4cb0ae82330..6e994eaa78c6 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.254"; + version = "1.3.261"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "v${version}"; - hash = "sha256-bxmDhKDM+OOTsSJEoGXlWPZciBcwevv0e4gHweH46JU="; + hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix new file mode 100644 index 000000000000..54e7afb3e58c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers }: + +stdenv.mkDerivation (finalAttrs: { + pname = "vulkan-utility-libraries"; + version = "1.3.261"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Utility-Libraries"; + rev = "v${finalAttrs.version}"; + hash = "sha256-szkBKNcxTHMYhhHFWr5WjD91Vf/AyZaGymvlDU9ff7s="; + }; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ vulkan-headers ]; + + meta = with lib; { + description = "A set of utility libraries for Vulkan"; + homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = []; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 726640293e34..789625f2f9f3 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -124,5 +124,5 @@ rec { ''; }; - wlroots = wlroots_0_15; + wlroots = wlroots_0_16; } diff --git a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index c88c7d42b128..845a8fcfdc49 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,32 +1,32 @@ -{ stdenv -, lib +{ dbus +, docbook-xsl-nons +, docbook_xml_dtd_43 , fetchurl +, glib +, lib +, libxslt , meson , ninja , pkg-config -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 -, dbus -, glib +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-dbus-proxy"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs="; + url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz"; + hash = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs="; }; nativeBuildInputs = [ + docbook-xsl-nons + docbook_xml_dtd_43 + libxslt meson ninja pkg-config - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 ]; buildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; - meta = with lib; { + meta = { description = "DBus proxy for Flatpak and others"; homepage = "https://github.com/flatpak/xdg-dbus-proxy"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21Plus; mainProgram = "xdg-dbus-proxy"; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.linux; }; -} +}) |