diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
527 files changed, 10558 insertions, 5848 deletions
diff --git a/nixpkgs/pkgs/development/libraries/LASzip/default.nix b/nixpkgs/pkgs/development/libraries/LASzip/default.nix index f170ea44c0ee..ee6e74aa7bc2 100644 --- a/nixpkgs/pkgs/development/libraries/LASzip/default.nix +++ b/nixpkgs/pkgs/development/libraries/LASzip/default.nix @@ -1,25 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fixDarwinDylibNames +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.4.3"; pname = "LASzip"; src = fetchFromGitHub { owner = "LASzip"; repo = "LASzip"; - rev = version; - sha256 = "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m"; + rev = finalAttrs.version; + hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY="; }; nativeBuildInputs = [ cmake + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; homepage = "https://laszip.org"; + changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.lgpl2; maintainers = [ lib.maintainers.michelk ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 7fe3fb38a1f7..aa1cd1d809f0 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.26.5"; + version = "2.28.1"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-rY/qPaG+ZMg8RbHTY6a0uo/WD1veOyPsc4VXCexeq/c="; + sha256 = "sha256-SXfOulwAVNvmwvEUZBrO1DzjvytB6mS2o3LWuhKcsV0="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix deleted file mode 100644 index a5057c0fbec8..000000000000 --- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: - -stdenv.mkDerivation rec { - pname = "SDL2_ttf"; - version = "2.0.15"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; - }; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 freetype libGL ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; - - meta = with lib; { - description = "SDL TrueType library"; - platforms = platforms.unix; - license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix b/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix index 0ec0aa312e83..9b8a163b206c 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Audio decoding, resampling and mixing library for SDL"; homepage = "https://github.com/realnc/SDL_audiolib"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix index 1c75853f5220..712f89e383ff 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch"; sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5"; }) + + # Bacport gcc-13 fix: + # https://github.com/abseil/abseil-cpp/pull/1187 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c.patch"; + hash = "sha256-aA7mwGEtv/cQINcawjkukmCvfNuqwUeDFssSiNKPdgg="; + }) ] ++ lib.optionals stdenv.hostPlatform.isLoongArch64 [ # https://github.com/abseil/abseil-cpp/pull/1110 (fetchpatch { diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix new file mode 100644 index 000000000000..a1c42c5df4b4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, static ? stdenv.hostPlatform.isStatic +, cxxStandard ? null +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "abseil-cpp"; + version = "20230125.3"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals (cxxStandard != null) [ + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.andersk ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/ada/spark2014/default.nix b/nixpkgs/pkgs/development/libraries/ada/spark2014/default.nix index d928dddfc8df..b89a56a397b9 100644 --- a/nixpkgs/pkgs/development/libraries/ada/spark2014/default.nix +++ b/nixpkgs/pkgs/development/libraries/ada/spark2014/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { postPatch = '' # gnat2why/gnat_src points to the GNAT sources - tar xf ${gnat12.cc.src} gcc-12.2.0/gcc/ada - mv gcc-12.2.0/gcc/ada gnat2why/gnat_src + tar xf ${gnat12.cc.src} gcc-${gnat12.cc.version}/gcc/ada + mv gcc-${gnat12.cc.version}/gcc/ada gnat2why/gnat_src ''; configurePhase = '' diff --git a/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix b/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix index 5cd2a4a9a232..1ecf4b843c74 100644 --- a/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "unstable-2023-02-09"; + version = "0.5"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "6b1ce0b67fd94693c1a3e340c8e8765380de0edc"; - hash = "sha256-XRCaW94oAgy2GOnFiI9c5A8mEx7AzlbT4pFd+PMmc9o="; + rev = "v${version}"; + hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k="; }; # The cubical library has several `Everything.agda` files, which are diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index aa3fe0b16b08..4dec50bcc776 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q2.2"; + version = "2023.Q2.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "V6DszDpiwvIcfWh2f8+1sWTQJHxwsxm0LoxSLoJOWHo="; + sha256 = "FoDXg0ocKBtwY22UJJCnyLn99CpmDE9HOMw7iiZkf6k="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/amf-headers/default.nix b/nixpkgs/pkgs/development/libraries/amf-headers/default.nix index 2d3d11ad5ec3..2d908e043f29 100644 --- a/nixpkgs/pkgs/development/libraries/amf-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/amf-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.29"; + version = "1.4.30"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-gu8plGUUVE/De2bRjTUN8JKsmj/0r/IsqhMpln1DZGU="; + sha256 = "sha256-eShqo5EBbhl2Us4feFjiX+NfEl1OQ2jPQUC+Hlm+yFs="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 1ccfbcd81ad8..178b9cf15ec0 100644 --- a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.18.1"; + version = "5.18.2"; src = fetchurl { - sha256 = "sha256-/t173pr1urrrByv3rrIGXZAhwmFj3tY5yHoy1nN5VHI="; + sha256 = "sha256-zT3z7C95HUf0NRvA5dX5iAwiCkUaMYIO2/g5li7IQwo="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/nixpkgs/pkgs/development/libraries/apr-util/default.nix index dd4b157d7a23..b44b410d30eb 100644 --- a/nixpkgs/pkgs/development/libraries/apr-util/default.nix +++ b/nixpkgs/pkgs/development/libraries/apr-util/default.nix @@ -12,11 +12,11 @@ assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { pname = "apr-util"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; - sha256 = "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk"; + sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; }; patches = [ ./fix-libxcrypt-build.patch ] diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index b7ec97180890..c1b0baa489f7 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.26"; + version = "0.8.28"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-24FSq9qe8tAFGB4BOjD52BQiy8Rw6ZDE5Sq+VS5S638="; + sha256 = "sha256-EgKZcylg3Nx320BdeEz8PVadwo2pE6a3h0vt7YT4LVA="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index d085dbc31ced..d5ee431e2bae 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.4.0"; + version = "12.6.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-mQUoJ4HO0/mXabDkWnBey1AZLKFiIwBwezMC6hZ9yIM="; + hash = "sha256-tBAqOEeRrxbZ5fuzBvEf41ar+8oKfXynq7yaipRmECo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix index 8692aa3017f7..2c1caf0bbb2b 100644 --- a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix @@ -19,7 +19,8 @@ , clblas , doxygen , buildDocs ? false -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudatoolkit , darwin }: diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 02f21ca5ef47..f61d9aa22158 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -81,11 +81,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-3dg0eIJ3XlOvfQlloZArfY/NCgMP0U94PU+F6CE1LVI="; + hash = "sha256-NIHEETk6oVx16I2Tz4MV+vf0PhgP4HkBKNOEDUF96Fg="; }; sourceRoot = "apache-arrow-${version}/cpp"; diff --git a/nixpkgs/pkgs/development/libraries/asmjit/default.nix b/nixpkgs/pkgs/development/libraries/asmjit/default.nix index 5335363c9ba3..7edc7c666a9c 100644 --- a/nixpkgs/pkgs/development/libraries/asmjit/default.nix +++ b/nixpkgs/pkgs/development/libraries/asmjit/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "asmjit"; - version = "unstable-2022-11-10"; + version = "unstable-2023-04-28"; src = fetchFromGitHub { owner = "asmjit"; repo = "asmjit"; - rev = "0c03ed2f7497441ac0de232bda2e6b8cc041b2dc"; - hash = "sha256-CfTtdgb+ZCLHwCRa+t2O4CG9rhHgqPLcfHDqLBvI9Tg="; + rev = "3577608cab0bc509f856ebf6e41b2f9d9f71acc4"; + hash = "sha256-EIfSruaM2Z64XOYAeEaf/wFy6/7UO6Sth487R1Q0yhI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix index 05f2d439adf3..9d57891905af 100644 --- a/nixpkgs/pkgs/development/libraries/assimp/default.nix +++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "5.2.5"; outputs = [ "out" "lib" "dev" ]; - src = fetchFromGitHub{ + src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; @@ -23,10 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ # Needed with GCC 12 "-Wno-error=array-bounds" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + "-Wno-error=free-nonheap-object" + ]); meta = with lib; { description = "A library to import various 3D model formats"; diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 926dd9b04fba..d4c3cd394ce6 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -23,15 +24,23 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.48.0"; + version = "2.48.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "kFpbbxeQto7oA7/6n1+rTOtZH7T64LL4xhLFTx1OijA="; + sha256 = "NzFt9DypmJzlOdVM9CmnaMKLs4oLNJUL6t0EIYJ+31U="; }; + patches = [ + # Fix implicit declaration of `strcasecmp`, which is an error on clang 16. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/147.patch"; + hash = "sha256-UU2n//Z9F1SyUGyuDKsiwZDyThsp/tJprz/zolDDTyw="; + }) + ]; + nativeBuildInputs = [ glib meson diff --git a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix index f058be4b645d..bb5a4e0dd53b 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.1"; + version = "0.7.2"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-vxddJkSLsTP3RxTzqIWecAC5NSL7NXdVnf/ANxYZEPk="; + hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 02ed9af632f6..9f5a68187c02 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I="; + sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index e8dda7006188..5928b5eaf8c7 100644 --- a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.20.1"; + version = "0.20.2"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-RfuJGHPJGDlajaKL1b2b20wFK3x4Vn+IRo87ppMOtvE="; + sha256 = "sha256-6oRVAL4pn+1+/LqLijKiBV6fZy3k9fZySwMwYHB1aUY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index 4a1bed05a3fb..c618a2ee3b5b 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.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-0LswdcV4VSg5o5uJ6vfw713eDnMbodZPQ9d2djxHc6k="; + sha256 = "sha256-jpNsH8c5ObnO+/AqsribvyFZhm7mmCFGNx9p4QHZKQE="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index 8273553a14ab..12dcbd12b9dd 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.102"; + version = "0.1.106"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0"; + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz"; + hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/basu/default.nix b/nixpkgs/pkgs/development/libraries/basu/default.nix index c9d005bf9d2a..25e5adf65771 100644 --- a/nixpkgs/pkgs/development/libraries/basu/default.nix +++ b/nixpkgs/pkgs/development/libraries/basu/default.nix @@ -8,6 +8,7 @@ , meson , ninja , python3 +, getent }: stdenv.mkDerivation (finalAttrs: { @@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja python3 + getent ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/bearssl/default.nix b/nixpkgs/pkgs/development/libraries/bearssl/default.nix index ba55c6d8932a..b8dc2e1e1806 100644 --- a/nixpkgs/pkgs/development/libraries/bearssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/bearssl/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 8e5b6abf5fcc..72231cf6d3c3 100644 --- a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "5.2.53"; + version = "5.2.64"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-uZrsDoLIq9jusM5kGXMjspWvFgRq2TF/CLMvTuDSEgM="; + sha256 = "sha256-5GTKunm6q5nTlfsA5vZZ0MCaSiit+JIdWHcb2t+MLEA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/blst/default.nix b/nixpkgs/pkgs/development/libraries/blst/default.nix new file mode 100644 index 000000000000..71b2814100ef --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/blst/default.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation ( finalAttrs: { + pname = "blst"; + version = "0.3.10"; + + src = fetchFromGitHub { + owner = "supranational"; + repo = "blst"; + rev = "v${finalAttrs.version}"; + hash = "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY="; + }; + + buildPhase = '' + runHook preBuild + + ./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} + ./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} + + runHook postBuild + ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/{lib,include} + for lib in libblst.{a,so,dylib}; do + if [ -f $lib ]; then + cp $lib $out/lib/ + fi + done + cp bindings/{blst.h,blst_aux.h} $out/include + + for lib in blst.dll; do + if [ -f $lib ]; then + mkdir -p $out/bin + cp $lib $out/bin/ + fi + done + + mkdir -p $out/lib/pkgconfig + cat <<EOF > $out/lib/pkgconfig/libblst.pc + prefix=$out + exec_prefix=''\\''${prefix} + libdir=''\\''${exec_prefix}/lib + includedir=''\\''${prefix}/include + + Name: libblst + Description: ${finalAttrs.meta.description} + URL: ${finalAttrs.meta.homepage} + Version: ${finalAttrs.version} + + Cflags: -I''\\''${includedir} + Libs: -L''\\''${libdir} -lblst + Libs.private: + EOF + + runHook postInstall + ''; + + # ensure we have the right install id set. Otherwise the library + # wouldn't be found during install. The alternative would be to work + # lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; + # into the setup.sh + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libblst.dylib $out/lib/libblst.dylib + ''; + + doCheck = true; + + meta = with lib; { + description = "Multilingual BLS12-381 signature library"; + homepage = "https://github.com/supranational/blst"; + license = licenses.isc; + maintainers = with maintainers; [ iquerejeta yvan-sraka ]; + platforms = platforms.all; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.68.nix b/nixpkgs/pkgs/development/libraries/boost/1.68.nix deleted file mode 100644 index 7fb85d7239f2..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/1.68.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.68.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_68_0.html - sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.69.nix b/nixpkgs/pkgs/development/libraries/boost/1.69.nix deleted file mode 100644 index c8846daa64f3..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/1.69.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.69.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_69_0.html - sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; - }; - - patches = [ ./pthread-stack-min-fix.patch ]; -}) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.70.nix b/nixpkgs/pkgs/development/libraries/boost/1.70.nix deleted file mode 100644 index 4d50f41e49ce..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/1.70.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.70.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_70_0.html - sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; - }; - - patches = [ ./pthread-stack-min-fix.patch ]; -}) diff --git a/nixpkgs/pkgs/development/libraries/boost/1.72.nix b/nixpkgs/pkgs/development/libraries/boost/1.72.nix deleted file mode 100644 index 4f2cc4848b19..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/1.72.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.72.0"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_72_0.html - sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; - }; - - patches = [ ./pthread-stack-min-fix.patch ]; -}) - diff --git a/nixpkgs/pkgs/development/libraries/boost/1.73.nix b/nixpkgs/pkgs/development/libraries/boost/1.73.nix deleted file mode 100644 index 97506873980f..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/1.73.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.73.0"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_73_0.html - sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"; - }; -}) - diff --git a/nixpkgs/pkgs/development/libraries/boost/1.74.nix b/nixpkgs/pkgs/development/libraries/boost/1.74.nix deleted file mode 100644 index f28f40048632..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/1.74.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.74.0"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_74_0.html - sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"; - }; -}) - diff --git a/nixpkgs/pkgs/development/libraries/boost/cmake-paths.patch b/nixpkgs/pkgs/development/libraries/boost/cmake-paths.patch deleted file mode 100644 index b7f90148f9dc..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/cmake-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam -index ad19f7b55..ec6bf57ff 100644 ---- a/tools/boost_install/boost-install.jam -+++ b/tools/boost_install/boost-install.jam -@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) - "# Compute the include and library directories relative to this file." - "" - "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" -+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" - : true ; - - if [ path.is-rooted $(cmakedir) ] -@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) - " unset(_BOOST_CMAKEDIR_ORIGINAL)" - "endif()" - "" -+ "# Assume that the installer actually did know where the libs were to be installed" -+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" - : true ; - } - diff --git a/nixpkgs/pkgs/development/libraries/boost/default.nix b/nixpkgs/pkgs/development/libraries/boost/default.nix index 27069b1ac03a..7a8902bc395d 100644 --- a/nixpkgs/pkgs/development/libraries/boost/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost/default.nix @@ -16,12 +16,6 @@ let } ); in { - boost168 = makeBoost ./1.68.nix; - boost169 = makeBoost ./1.69.nix; - boost170 = makeBoost ./1.70.nix; - boost172 = makeBoost ./1.72.nix; - boost173 = makeBoost ./1.73.nix; - boost174 = makeBoost ./1.74.nix; boost175 = makeBoost ./1.75.nix; boost177 = makeBoost ./1.77.nix; boost178 = makeBoost ./1.78.nix; diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index 7d8aee067c86..cad0f3aaed69 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -31,9 +31,6 @@ assert enableShared || enableStatic; assert enableNumpy -> enablePython; -# Boost <1.69 can't be built on linux with clang >8, because pth was removed -assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69"; - let variant = lib.concatStringsSep "," @@ -75,7 +72,10 @@ let then if lib.versionOlder version "1.78" then "mips1" else "mips" else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" - "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" + # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o" + "binary-format=${if stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.macho + then "mach-o" + else toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}" # adapted from table in boost manual @@ -107,34 +107,40 @@ stdenv.mkDerivation { patches = patches ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch - # Fix boost-context segmentation faults on ppc64 due to ABI violation - ++ lib.optional (lib.versionOlder version "1.71") (fetchpatch { - url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch"; - sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29"; - stripLen = 1; - extraPrefix = "libs/context/"; - }) - ++ lib.optional (lib.versionOlder version "1.70") (fetchpatch { - # support for Mips64n64 appeared in boost-context 1.70 - url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch"; - sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI="; - stripLen = 1; - extraPrefix = "libs/context/"; - }) - ++ lib.optional (lib.versionAtLeast version "1.70" && lib.versionOlder version "1.73") ./cmake-paths.patch - ++ lib.optional (lib.versionAtLeast version "1.73") ./cmake-paths-173.patch + ++ [ ./cmake-paths-173.patch ] ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; - }); + }) + # This fixes another issue regarding ill-formed constant expressions, which is a default error + # in clang 16 and will be a hard error in clang 17. + ++ lib.optional (lib.versionOlder version "1.80") (fetchpatch { + url = "https://github.com/boostorg/log/commit/77f1e20bd69c2e7a9e25e6a9818ae6105f7d070c.patch"; + relative = "include"; + hash = "sha256-6qOiGJASm33XzwoxVZfKJd7sTlQ5yd+MMFQzegXm5RI="; + }) + ++ lib.optionals (lib.versionOlder version "1.81") [ + # libc++ 15 dropped support for `std::unary_function` and `std::binary_function` in C++17+. + # C++17 is the default for clang 16, but clang 15 is also affected in that language mode. + # This patch is for Boost 1.80, but it also applies to earlier versions. + (fetchpatch { + url = "https://www.boost.org/patches/1_80_0/0005-config-libcpp15.patch"; + hash = "sha256-ULFMzKphv70unvPZ3o4vSP/01/xbSM9a2TlIV67eXDQ="; + }) + # This fixes another ill-formed contant expressions issue flagged by clang 16. + (fetchpatch { + url = "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch"; + relative = "include"; + hash = "sha256-dq4SVgxkPJSC7Fvr59VGnXkM4Lb09kYDaBksCHo9C0s="; + }) + ]; meta = with lib; { homepage = "http://boost.org/"; description = "Collection of C++ libraries"; license = licenses.boost; platforms = platforms.unix ++ platforms.windows; - badPlatforms = optionals (versionOlder version "1.73") platforms.riscv; maintainers = with maintainers; [ hjones2199 ]; broken = diff --git a/nixpkgs/pkgs/development/libraries/boost/pthread-stack-min-fix.patch b/nixpkgs/pkgs/development/libraries/boost/pthread-stack-min-fix.patch deleted file mode 100644 index b6c85f840529..000000000000 --- a/nixpkgs/pkgs/development/libraries/boost/pthread-stack-min-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Taken from https://github.com/conan-io/conan-center-index/pull/361/files - -diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp -index aefbeb4..bc9b136 100644 ---- a/boost/thread/pthread/thread_data.hpp -+++ b/boost/thread/pthread/thread_data.hpp -@@ -57,7 +57,7 @@ namespace boost - #else - std::size_t page_size = ::sysconf( _SC_PAGESIZE); - #endif --#if PTHREAD_STACK_MIN > 0 -+#ifdef PTHREAD_STACK_MIN - if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN; - #endif - size = ((size+page_size-1)/page_size)*page_size; diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 52f29287f8ea..e2b4aa880415 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -4,7 +4,4 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; revision = "3"; sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; - postPatch = '' - sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt - ''; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/3.0.nix b/nixpkgs/pkgs/development/libraries/botan/3.0.nix new file mode 100644 index 000000000000..139c002bb3be --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/botan/3.0.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchpatch, lib, ... } @ args: + +callPackage ./generic.nix (args // { + baseVersion = "3.1"; + revision = "1"; + sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. + badPlatforms = lib.platforms.darwin; +}) diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 1c5126584c2c..795cd5189efe 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -4,10 +4,11 @@ , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , extraPatches ? [ ] +, badPlatforms ? [ ] , postPatch ? null , knownVulnerabilities ? [ ] -, CoreServices -, Security +, CoreServices ? null +, Security ? null , ... }: @@ -15,6 +16,8 @@ stdenv.mkDerivation rec { pname = "botan"; version = "${baseVersion}.${revision}"; + outputs = [ "out" "dev" ]; + src = fetchurl { name = "Botan-${version}.${sourceExtension}"; urls = [ @@ -26,11 +29,14 @@ stdenv.mkDerivation rec { patches = extraPatches; inherit postPatch; - buildInputs = [ python3 bzip2 zlib gmp boost ] + nativeBuildInputs = [ python3 ]; + buildInputs = [ bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} + runHook preConfigure + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"} + runHook postConfigure ''; enableParallelBuilding = true; @@ -50,9 +56,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cryptographic algorithms library"; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin thillux ]; platforms = platforms.unix; license = licenses.bsd2; + inherit badPlatforms; inherit knownVulnerabilities; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix index a2ace544b7c9..ff33c7bd0979 100644 --- a/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -1,7 +1,7 @@ { lib , stdenv +, cmake , fetchFromGitHub -, pkg-config , fixDarwinDylibNames }: @@ -16,31 +16,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g="; }; - # replace faulty macos detection - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile - ''; - - configurePhase = "patchShebangs make.sh "; - buildPhase = "PREFIX=$out ./make.sh"; - - doCheck = true; - checkPhase = '' - # first remove fuzzing steps from check target - substituteInPlace Makefile --replace "fuzztest fuzzallcorp" "" - make check - ''; - - installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") - + "PREFIX=$out ./make.sh install"; - nativeBuildInputs = [ - pkg-config + cmake ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - enableParallelBuilding = true; + doCheck = true; meta = { description = "Advanced disassembly library"; diff --git a/nixpkgs/pkgs/development/libraries/cctag/default.nix b/nixpkgs/pkgs/development/libraries/cctag/default.nix index 706d2becbef5..2c1a5f9ae786 100644 --- a/nixpkgs/pkgs/development/libraries/cctag/default.nix +++ b/nixpkgs/pkgs/development/libraries/cctag/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake -, boost +, boost179 , eigen , opencv , tbb @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + boost179 eigen opencv ]; diff --git a/nixpkgs/pkgs/development/libraries/cdo/default.nix b/nixpkgs/pkgs/development/libraries/cdo/default.nix index ece7ab2f6921..8bece077f8c5 100644 --- a/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes +{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes, python3 , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "2.0.5"; + version = "2.2.0"; # Dependencies - buildInputs = [ curl netcdf hdf5 ]; + buildInputs = [ curl netcdf hdf5 python3 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/26823/${pname}-${version}.tar.gz"; - sha256 = "sha256-7e678cOxofDGQtrmvIx2JODFS6vkYQZNxcfaykpbDc4="; + url = "https://code.mpimet.mpg.de/attachments/download/28013/${pname}-${version}.tar.gz"; + sha256 = "sha256-Z5yNEFcGyv/LoJYOxd3EoTMsG0DFL4LDk3NWmZ2PrfI="; }; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { There are more than 600 operators available. ''; homepage = "https://code.mpimet.mpg.de/projects/cdo/"; - license = licenses.gpl2; + license = licenses.bsd3; maintainers = [ maintainers.ltavard ]; platforms = with platforms; linux ++ darwin; }; diff --git a/nixpkgs/pkgs/development/libraries/cegui/default.nix b/nixpkgs/pkgs/development/libraries/cegui/default.nix index cb302f3381ca..c56c59d02ad1 100644 --- a/nixpkgs/pkgs/development/libraries/cegui/default.nix +++ b/nixpkgs/pkgs/development/libraries/cegui/default.nix @@ -1,19 +1,53 @@ -{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ogre +, freetype +, boost +, expat +, darwin +, libiconv +, unstableGitUpdater +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cegui"; - version = "0.8.7"; + version = "unstable-2023-03-18"; - src = fetchurl { - url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2"; - sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; + src = fetchFromGitHub { + owner = "paroj"; + repo = "cegui"; + rev = "186ce900e293b98f2721c11930248a8de54aa338"; + hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ogre freetype boost expat ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + strictDeps = true; - cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + ogre + freetype + boost + expat + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + libiconv + ]; + + cmakeFlags = [ + "-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" + ]; + + passthru.updateScript = unstableGitUpdater { + branch = "v0"; + }; meta = with lib; { homepage = "http://cegui.org.uk/"; diff --git a/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix b/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix new file mode 100644 index 000000000000..ab438eb6a8bf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cereal"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE="; + }; + + patches = [ + (fetchpatch { + name = "CVE-2020-11105.patch"; + url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; + hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = { + homepage = "https://uscilab.github.io/cereal/"; + description = "A header-only C++11 serialization library"; + changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix b/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix new file mode 100644 index 000000000000..5a44b26426c7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cereal"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-HapnwM5oSNKuqoKm5x7+i2zt0sny8z8CePwobz1ITQs="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = { + homepage = "https://uscilab.github.io/cereal/"; + description = "A header-only C++11 serialization library"; + changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/cereal/default.nix b/nixpkgs/pkgs/development/libraries/cereal/default.nix deleted file mode 100644 index 958a92dec34e..000000000000 --- a/nixpkgs/pkgs/development/libraries/cereal/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: -stdenv.mkDerivation rec { - pname = "cereal"; - version = "1.3.0"; - - nativeBuildInputs = [ cmake ]; - - src = fetchFromGitHub { - owner = "USCiLab"; - repo = "cereal"; - rev = "v${version}"; - sha256 = "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"; - }; - - patches = [ - # https://nvd.nist.gov/vuln/detail/CVE-2020-11105 - # serialized std::shared_ptr variables cannot always be expected to - # serialize back into their original values. This can have any number of - # consequences, depending on the context within which this manifests. - (fetchpatch { - name = "CVE-2020-11105.patch"; - url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; - sha256 = "CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; - }) - ]; - - cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; - - meta = with lib; { - description = "A header-only C++11 serialization library"; - homepage = "https://uscilab.github.io/cereal/"; - platforms = platforms.all; - license = licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index 304e984f94f1..4ef014bfa521 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${finalAttrs.version}"; - hash = "sha256-1S48Ex44OKdpf6bsXZes7AFA1cAJZELGJqvC4V9sHdA="; + hash = "sha256-HEqjvL16Ca3Al3I6VK50CU6zHFj9Nn/SAXXCfRU4rgo="; }; outputs = [ "out" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/cjose/default.nix b/nixpkgs/pkgs/development/libraries/cjose/default.nix index 1158fa01cfbd..4ecca1290e35 100644 --- a/nixpkgs/pkgs/development/libraries/cjose/default.nix +++ b/nixpkgs/pkgs/development/libraries/cjose/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cjose"; - version = "0.6.2.1"; + version = "0.6.2.2"; src = fetchFromGitHub { owner = "zmartzone"; repo = "cjose"; rev = "v${version}"; - sha256 = "sha256-QgSO4jFouowDJeUTT4kUEXD+ctQ7JiY/5DkiPyb+Z/I="; + sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/cjson/default.nix b/nixpkgs/pkgs/development/libraries/cjson/default.nix index ccf3311317aa..526da3f7718e 100644 --- a/nixpkgs/pkgs/development/libraries/cjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/cjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjson"; - version = "1.7.15"; + version = "1.7.16"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; rev = "v${version}"; - sha256 = "sha256-PpUVsLklcs5hCCsQcsXw0oEVIWecKnQO16Hy0Ba8ov8="; + sha256 = "sha256-sdhnDpaAO9Fau4uMzNXrbOJ2k0b8+MdhKh6rpFMUwaQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/clfft/default.nix b/nixpkgs/pkgs/development/libraries/clfft/default.nix index 8af7a57e6555..824449b0fafc 100644 --- a/nixpkgs/pkgs/development/libraries/clfft/default.nix +++ b/nixpkgs/pkgs/development/libraries/clfft/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' sed -i '/-m64/d;/-m32/d' CMakeLists.txt diff --git a/nixpkgs/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch b/nixpkgs/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch new file mode 100644 index 000000000000..93407d5f9ff6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch @@ -0,0 +1,14 @@ +diff --git a/Clipper2.pc.cmakein b/Clipper2.pc.cmakein +index 5632c93..0a5d6ba 100644 +--- a/Clipper2.pc.cmakein ++++ b/Clipper2.pc.cmakein +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: Clipper2@PCFILE_LIB_SUFFIX@ + Description: A Polygon Clipping and Offsetting library in C++ diff --git a/nixpkgs/pkgs/development/libraries/clipper2/default.nix b/nixpkgs/pkgs/development/libraries/clipper2/default.nix new file mode 100644 index 000000000000..f7bb635e63d0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/clipper2/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "clipper2"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "AngusJohnson"; + repo = "Clipper2"; + rev = "Clipper2_${version}"; + sha256 = "sha256-u/4GG1A2PAlk8VEWgJX8+EnZ5hpGhu1QbvHwct58sF4="; + }; + + sourceRoot = "${src.name}/CPP"; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DCLIPPER2_EXAMPLES=OFF" + "-DCLIPPER2_TESTS=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + patches = [ + ./0001-fix-pc-paths.patch + ]; + + meta = { + description = "Polygon Clipping and Offsetting - C++ Only"; + longDescription = '' + The Clipper2 library performs intersection, union, difference and XOR boolean operations on both simple and + complex polygons. It also performs polygon offsetting. + ''; + homepage = "https://github.com/AngusJohnson/Clipper2"; + license = lib.licenses.boost; + maintainers = [ lib.maintainers.cadkin ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 4cf7dec674f3..650913fc3888 100644 --- a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.11"; + version = "0.29.0.gfm.13"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-2jkMJcfcOH5qYP13qS5Hutbyhhzq9WlqlkthmQoJoCM="; + sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cmocka/default.nix b/nixpkgs/pkgs/development/libraries/cmocka/default.nix index 968bb91181ce..6c88d1baebfa 100644 --- a/nixpkgs/pkgs/development/libraries/cmocka/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmocka/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "0xksffx1w3pzm18ynf28cx8scrhylcbz43s1rgkkdqnyil1q6cjv"; + sha256 = "sha256-gQVw6wuNZIBDMfgrKf9Hx5DOnNaxY+mNR6SAcEfsrYI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix index 6a532a78f2d4..7b1a226de812 100644 --- a/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; rev = "v${version}"; - hash = "sha256-7E/Iqan3DVFl9pwsY6pwWM64ug1cjN6DH+u7XzraA78="; + hash = "sha256-p1WMp17PCnr50bXDSd6A4Je7AfKVHuLmyEue9221zPs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/coeurl/default.nix b/nixpkgs/pkgs/development/libraries/coeurl/default.nix index 4d04abee3adc..9e779dea6d89 100644 --- a/nixpkgs/pkgs/development/libraries/coeurl/default.nix +++ b/nixpkgs/pkgs/development/libraries/coeurl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , ninja , pkg-config , meson @@ -20,6 +21,22 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; }; + patches = [ + # Fix compatibility issues with curl > 7.85, see: + # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a + # PATCH CAN BE REMOVED AFTER 0.3.0 + (fetchpatch { + url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch"; + hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY="; + }) + # Fix error when building with fmt >= 10, see: + # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc + # PATCH CAN BE REMOVED AFTER 0.3.0 + (fetchpatch { + url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch"; + hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w="; + }) + ]; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix b/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix index 531d5d66f3ff..54bf1251c309 100644 --- a/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix +++ b/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix @@ -13,104 +13,74 @@ , gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] }: -let - # This is now over 3GB, to allow hydra caching we separate it - ck = stdenv.mkDerivation (finalAttrs: { - pname = "composable_kernel"; - version = "unstable-2023-01-16"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildExamples [ - "example" - ]; - - # ROCm 5.6 should release composable_kernel as stable with a tag in the future - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "composable_kernel"; - rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef"; - hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - clang-tools-extra - ]; - - buildInputs = [ - openmp - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ] ++ lib.optionals (gpuTargets != [ ]) [ - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] ++ lib.optionals buildTests [ - "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names - ]; - - # No flags to build selectively it seems... - postPatch = lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - '' + lib.optionalString (!buildExamples) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(example)" "" - ''; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' + lib.optionalString buildExamples '' - mkdir -p $example/bin - mv $out/bin/example_* $example/bin - ''; - - passthru.updateScript = unstableGitUpdater { }; - - # Times out otherwise - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "Performance portable programming model for machine learning tensor operators"; - homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - }; - }); - -in stdenv.mkDerivation { - inherit (ck) pname version outputs src passthru requiredSystemFeatures meta; - - dontUnpack = true; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall +stdenv.mkDerivation (finalAttrs: { + pname = "composable_kernel"; + version = "unstable-2023-01-16"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildExamples [ + "example" + ]; + + # ROCm 5.6 should release composable_kernel as stable with a tag in the future + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "composable_kernel"; + rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef"; + hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + clang-tools-extra + ]; + + buildInputs = [ + openmp + ]; + + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names + ]; + + # No flags to build selectively it seems... + postPatch = lib.optionalString (!buildTests) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + '' + lib.optionalString (!buildExamples) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(example)" "" + ''; - mkdir -p $out - cp -an ${ck}/* $out - '' + lib.optionalString buildTests '' - cp -a ${ck.test} $test + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/test_* $test/bin '' + lib.optionalString buildExamples '' - cp -a ${ck.example} $example - '' + '' - runHook postInstall + mkdir -p $example/bin + mv $out/bin/example_* $example/bin ''; - # Fix paths - preFixup = '' - substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ - --replace "${ck}" "$out" - ''; -} + passthru.updateScript = unstableGitUpdater { }; + + # Times out otherwise + requiredSystemFeatures = [ "big-parallel" ]; + + meta = with lib; { + description = "Performance portable programming model for machine learning tensor operators"; + homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 001a1ee7eac0..c3731c0e7a75 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24="; + sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g="; }; nativeBuildInputs = [ cmake ]; @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; + + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( diff --git a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index 332d9409ab11..eb3f03d57e40 100644 --- a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "sha256-hKMHJF/FXPeQjkEXLTN6zjKMaVGa3LdIebXya3NRSzU="; + sha256 = "sha256-HTdaV1cLbwGYuikS9EAVvAOdLmCoWlvVXlpYsUwY5IA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix index b0568e3c355e..8a8caa556c87 100644 --- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.7.0"; + version = "8.8.0"; underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - hash = "sha256-KtZXW7+J9a4uKHnK8sqj5WVaIjG3d6tzBBDxa7Wv4AE="; + hash = "sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/csfml/default.nix b/nixpkgs/pkgs/development/libraries/csfml/default.nix index 3aebe23ee38c..397d5186a1c4 100644 --- a/nixpkgs/pkgs/development/libraries/csfml/default.nix +++ b/nixpkgs/pkgs/development/libraries/csfml/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "csfml"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; rev = version; - sha256 = "sha256-a46V5CakKVygNfr3/nZwlsCyqNsbti4a3cr7itK5QfI="; + sha256 = "sha256-A5C/4SnxUX7mW1wkPWJWX3dwMhrJ79DkBuZ7UYzTOqE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ sfml ]; diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix new file mode 100644 index 000000000000..a4ebfb5c3de1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, darwin # Accelerate +, llvmPackages # openmp +, withMkl ? false, mkl +# Enabling both withOneDNN and withOpenblas is broken +# https://github.com/OpenNMT/CTranslate2/issues/1294 +, withOneDNN ? false, oneDNN +, withOpenblas ? true, openblas +, withRuy ? true +}: + +let + cmakeBool = b: if b then "ON" else "OFF"; +in +stdenv.mkDerivation rec { + pname = "ctranslate2"; + version = "3.18.0"; + + src = fetchFromGitHub { + owner = "OpenNMT"; + repo = "CTranslate2"; + rev = "v${version}"; + hash = "sha256-ipCUiCyWubKTUB0jDOsRN+DSg3S84hbj8Xum/2NsrKc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + # https://opennmt.net/CTranslate2/installation.html#build-options + # https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53 + # https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12 + "-DOPENMP_RUNTIME=COMP" + "-DWITH_DNNL=${cmakeBool withOneDNN}" + "-DWITH_OPENBLAS=${cmakeBool withOpenblas}" + "-DWITH_RUY=${cmakeBool withRuy}" + "-DWITH_MKL=${cmakeBool withMkl}" + ] + ++ lib.optional stdenv.isDarwin "-DWITH_ACCELERATE=ON"; + + buildInputs = lib.optionals withMkl [ + mkl + ] ++ lib.optionals withOneDNN [ + oneDNN + ] ++ lib.optionals withOpenblas [ + openblas + ] ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp + darwin.apple_sdk.frameworks.Accelerate + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.CoreVideo + ]; + + meta = with lib; { + description = "Fast inference engine for Transformer models"; + homepage = "https://github.com/OpenNMT/CTranslate2"; + changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index 273bfef3190c..4228a3cb5876 100644 --- a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeCheckInputs = [ python3Packages.ply ]; diff --git a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix index f90c6633d7c7..0d236c36aa3c 100644 --- a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix @@ -2,7 +2,7 @@ , faad2, fftwFloat, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "dab_lib"; version = "unstable-2023-03-02"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "source/library/"; + sourceRoot = "${finalAttrs.src.name}/library/"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ alexwinter ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index d456f1d43ba6..8476860f1e79 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -10,13 +10,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-Y9wqa6lIs0eKT+q+95gjzfHIc3pglXzLNaDjsWy1gok="; + hash = "sha256-RrEim3HXXjx2RUU7K3wPH3QbhNTRN9ZX/oAcyE9aV8I="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/db/clang-4.8.patch b/nixpkgs/pkgs/development/libraries/db/clang-4.8.patch index aa46b8500b5a..0aff87682037 100644 --- a/nixpkgs/pkgs/development/libraries/db/clang-4.8.patch +++ b/nixpkgs/pkgs/development/libraries/db/clang-4.8.patch @@ -139,3 +139,67 @@ index f3922e0..e40fcdf 100644 } else { DB_ASSERT(env, sharecount > 0); MEMBAR_EXIT(); +diff -ur a/dist/aclocal/clock.m4 b/dist/aclocal/clock.m4 +--- a/dist/aclocal/clock.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/clock.m4 2023-06-05 19:14:02.007080500 -0400 +@@ -21,6 +21,7 @@ + AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ + AC_TRY_RUN([ + #include <sys/time.h> ++int + main() { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); +diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4 +--- a/dist/aclocal/mutex.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/mutex.m4 2023-06-05 19:14:47.214158196 -0400 +@@ -4,6 +4,7 @@ + AC_DEFUN(AM_PTHREADS_SHARED, [ + AC_TRY_RUN([ + #include <pthread.h> ++int + main() { + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -46,6 +47,7 @@ + AC_DEFUN(AM_PTHREADS_PRIVATE, [ + AC_TRY_RUN([ + #include <pthread.h> ++int + main() { + pthread_cond_t cond; + pthread_mutex_t mutex; +diff -ur a/dist/aclocal/sequence.m4 b/dist/aclocal/sequence.m4 +--- a/dist/aclocal/sequence.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/sequence.m4 2023-06-05 19:14:02.007869956 -0400 +@@ -43,6 +43,9 @@ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ ++ #include <string.h> ++ #include <stdio.h> ++ int + main() { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; +@@ -59,7 +62,9 @@ + return (1); + return (0); + }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ ++ AC_TRY_LINK([ ++ #include <string.h> ++ #include <stdio.h>],[ + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +diff -ur a/dist/RELEASE b/dist/RELEASE +--- a/dist/RELEASE 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/RELEASE 2023-07-02 17:32:34.703953049 -0400 +@@ -7,5 +7,5 @@ + + DB_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DB_VERSION_MAJOR $DB_VERSION_MINOR` + +-DB_RELEASE_DATE=`date "+%B %e, %Y"` ++DB_RELEASE_DATE="April 9, 2010" + DB_VERSION_STRING="Berkeley DB $DB_VERSION: ($DB_RELEASE_DATE)" diff --git a/nixpkgs/pkgs/development/libraries/db/clang-5.3.patch b/nixpkgs/pkgs/development/libraries/db/clang-5.3.patch index caf19ffeb92b..823a71d6532f 100644 --- a/nixpkgs/pkgs/development/libraries/db/clang-5.3.patch +++ b/nixpkgs/pkgs/development/libraries/db/clang-5.3.patch @@ -139,3 +139,111 @@ index 106b161..fc4de9d 100644 } else { DB_ASSERT(env, sharecount > 0); MEMBAR_EXIT(); +diff -ur a/dist/aclocal/clock.m4 b/dist/aclocal/clock.m4 +--- a/dist/aclocal/clock.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/clock.m4 2023-06-05 19:14:02.007080500 -0400 +@@ -21,6 +21,7 @@ + AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ + AC_TRY_RUN([ + #include <sys/time.h> ++int + main() { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); +diff -ur a/dist/aclocal/mmap.m4 b/dist/aclocal/mmap.m4 +--- a/dist/aclocal/mmap.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/mmap.m4 2023-06-05 19:14:02.007323624 -0400 +@@ -29,6 +29,8 @@ + * system to system. + */ + #include <stdio.h> ++ #include <stdlib.h> ++ #include <unistd.h> + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -42,12 +44,13 @@ + #define MAP_FAILED (-1) + #endif + +- int catch_sig(sig) ++ void catch_sig(sig) + int sig; + { + exit(1); + } + ++ int + main() { + const char *underlying; + unsigned gapsize; +@@ -88,8 +91,8 @@ + return (4); + } + +- (void) signal(SIGSEGV, catch_sig); +- (void) signal(SIGBUS, catch_sig); ++ (void) signal(SIGSEGV, &catch_sig); ++ (void) signal(SIGBUS, &catch_sig); + + for (i = sizeof(buf); i < total_size; i += gapsize) + base[i] = 'A'; +diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4 +--- a/dist/aclocal/mutex.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/mutex.m4 2023-06-05 19:14:47.214158196 -0400 +@@ -5,6 +5,7 @@ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> ++int + main() { + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -49,6 +50,7 @@ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> ++int + main() { + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -89,6 +91,7 @@ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> ++int + main() { + pthread_cond_t cond; + pthread_condattr_t condattr; +@@ -110,6 +113,7 @@ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> ++int + main() { + pthread_rwlock_t rwlock; + pthread_rwlockattr_t rwlockattr; +diff -ur a/dist/aclocal/sequence.m4 b/dist/aclocal/sequence.m4 +--- a/dist/aclocal/sequence.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/sequence.m4 2023-06-05 19:14:02.007869956 -0400 +@@ -43,6 +43,9 @@ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ ++ #include <string.h> ++ #include <stdio.h> ++ int + main() { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; +@@ -59,7 +62,9 @@ + return (1); + return (0); + }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ ++ AC_TRY_LINK([ ++ #include <string.h> ++ #include <stdio.h>],[ + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; diff --git a/nixpkgs/pkgs/development/libraries/db/darwin-mutexes-4.8.patch b/nixpkgs/pkgs/development/libraries/db/darwin-mutexes-4.8.patch new file mode 100644 index 000000000000..09d5b814f161 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/db/darwin-mutexes-4.8.patch @@ -0,0 +1,55 @@ +diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4 +--- a/dist/aclocal/mutex.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/mutex.m4 2023-06-05 19:14:47.214158196 -0400 +@@ -372,10 +376,11 @@ + + # _spin_lock_try/_spin_unlock: Apple/Darwin + if test "$db_cv_mutex" = no; then +-AC_TRY_LINK(,[ +- int x; +- _spin_lock_try(&x); +- _spin_unlock(&x); ++AC_TRY_LINK([ ++#include <os/lock.h>],[ ++ os_unfair_lock x = OS_UNFAIR_LOCK_INIT; ++ bool _ = os_unfair_lock_trylock(&x); ++ os_unfair_lock_unlock(&x); + ], [db_cv_mutex=Darwin/_spin_lock_try]) + fi + +diff -ur a/dbinc/mutex_int.h b/dbinc/mutex_int.h +--- a/dbinc/mutex_int.h 1969-12-31 19:00:01.000000000 -0500 ++++ b/dbinc/mutex_int.h 2023-06-05 19:15:37.510514745 -0400 +@@ -154,14 +154,13 @@ + * Apple/Darwin library functions. + *********************************************************************/ + #ifdef HAVE_MUTEX_DARWIN_SPIN_LOCK_TRY +-typedef u_int32_t tsl_t; ++#include <os/lock.h> ++typedef os_unfair_lock tsl_t; + + #ifdef LOAD_ACTUAL_MUTEX_CODE +-extern int _spin_lock_try(tsl_t *); +-extern void _spin_unlock(tsl_t *); +-#define MUTEX_SET(tsl) _spin_lock_try(tsl) +-#define MUTEX_UNSET(tsl) _spin_unlock(tsl) +-#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0) ++#define MUTEX_SET(tsl) os_unfair_lock_trylock(tsl) ++#define MUTEX_UNSET(tsl) os_unfair_lock_unlock(tsl) ++#define MUTEX_INIT(tsl) ({ *(tsl) = OS_UNFAIR_LOCK_INIT; tsl; }) + #endif + #endif + +diff -ur a/dbinc/mutex_int.h b/dbinc/mutex_int.h +--- a/dbinc_auto/mutex_ext.h 1969-12-31 19:00:01.000000000 -0500 ++++ b/dbinc_auto/mutex_ext.h 2023-07-01 22:38:20.749201366 -0400 +@@ -34,6 +34,9 @@ + #if !defined(HAVE_ATOMIC_SUPPORT) && defined(HAVE_MUTEX_SUPPORT) + atomic_value_t __atomic_dec __P((ENV *, db_atomic_t *)); + #endif ++#if !defined(HAVE_ATOMIC_SUPPORT) && defined(HAVE_MUTEX_SUPPORT) ++int atomic_compare_exchange __P((ENV *, db_atomic_t *, atomic_value_t, atomic_value_t)); ++#endif + int __db_pthread_mutex_init __P((ENV *, db_mutex_t, u_int32_t)); + int __db_pthread_mutex_lock __P((ENV *, db_mutex_t)); + #if defined(HAVE_SHARED_LATCHES) diff --git a/nixpkgs/pkgs/development/libraries/db/darwin-mutexes.patch b/nixpkgs/pkgs/development/libraries/db/darwin-mutexes.patch new file mode 100644 index 000000000000..c0616fda7f7f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/db/darwin-mutexes.patch @@ -0,0 +1,42 @@ +diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4 +--- a/dist/aclocal/mutex.m4 1969-12-31 19:00:01.000000000 -0500 ++++ b/dist/aclocal/mutex.m4 2023-06-05 19:14:47.214158196 -0400 +@@ -441,10 +445,11 @@ + + # _spin_lock_try/_spin_unlock: Apple/Darwin + if test "$db_cv_mutex" = no; then +-AC_TRY_LINK(,[ +- int x; +- _spin_lock_try(&x); +- _spin_unlock(&x); ++AC_TRY_LINK([ ++#include <os/lock.h>],[ ++ os_unfair_lock x = OS_UNFAIR_LOCK_INIT; ++ bool _ = os_unfair_lock_trylock(&x); ++ os_unfair_lock_unlock(&x); + ], [db_cv_mutex=Darwin/_spin_lock_try]) + fi + +diff -ur a/src/dbinc/mutex_int.h b/src/dbinc/mutex_int.h +--- a/src/dbinc/mutex_int.h 1969-12-31 19:00:01.000000000 -0500 ++++ b/src/dbinc/mutex_int.h 2023-06-05 19:15:37.510514745 -0400 +@@ -154,14 +154,13 @@ + * Apple/Darwin library functions. + *********************************************************************/ + #ifdef HAVE_MUTEX_DARWIN_SPIN_LOCK_TRY +-typedef u_int32_t tsl_t; ++#include <os/lock.h> ++typedef os_unfair_lock tsl_t; + + #ifdef LOAD_ACTUAL_MUTEX_CODE +-extern int _spin_lock_try(tsl_t *); +-extern void _spin_unlock(tsl_t *); +-#define MUTEX_SET(tsl) _spin_lock_try(tsl) +-#define MUTEX_UNSET(tsl) _spin_unlock(tsl) +-#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0) ++#define MUTEX_SET(tsl) os_unfair_lock_trylock(tsl) ++#define MUTEX_UNSET(tsl) os_unfair_lock_unlock(tsl) ++#define MUTEX_INIT(tsl) ({ *(tsl) = OS_UNFAIR_LOCK_INIT; tsl; }) + #endif + #endif + diff --git a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix index 5cf9200a9ab9..81705374381e 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-4.8.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-4.8.nix @@ -1,9 +1,13 @@ -{ lib, stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: import ./generic.nix (args // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; + extraPatches = [ + ./clang-4.8.patch + ./CVE-2017-10140-4.8-cwd-db_config.patch + ./darwin-mutexes-4.8.patch + ]; drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix index 0bb5c4cd6a4a..2362cc9eecb0 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-5.3.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-5.3.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: import ./generic.nix (args // { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; + extraPatches = [ + ./clang-5.3.patch + ./CVE-2017-10140-cwd-db_config.patch + ./darwin-mutexes.patch + ]; }) diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix index 49935dd2399b..94c8d8976131 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix @@ -1,8 +1,12 @@ -{ lib, stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; + extraPatches = [ + ./clang-6.0.patch + ./CVE-2017-10140-cwd-db_config.patch + ./darwin-mutexes.patch + ]; }) diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix index b2c0fd7ac8fc..e526555b06e1 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix @@ -1,8 +1,12 @@ -{ lib, stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; + extraPatches = [ + ./clang-6.0.patch + ./CVE-2017-10140-cwd-db_config.patch + ./darwin-mutexes.patch + ]; }) diff --git a/nixpkgs/pkgs/development/libraries/db/generic.nix b/nixpkgs/pkgs/development/libraries/db/generic.nix index 59df0e8469cb..d715c1ffc8b1 100644 --- a/nixpkgs/pkgs/development/libraries/db/generic.nix +++ b/nixpkgs/pkgs/development/libraries/db/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, autoreconfHook , cxxSupport ? true , compat185 ? true , dbmSupport ? false @@ -19,10 +19,48 @@ stdenv.mkDerivation (rec { sha256 = sha256; }; + # The provided configure script features `main` returning implicit `int`, which causes + # configure checks to work incorrectly with clang 16. + nativeBuildInputs = [ autoreconfHook ]; + patches = extraPatches; outputs = [ "bin" "out" "dev" ]; + # Required when regenerated the configure script to make sure the vendored macros are found. + autoreconfFlags = [ "-fi" "-Iaclocal" "-Iaclocal_java" ]; + + preAutoreconf = '' + pushd dist + # Upstream’s `dist/s_config` cats everything into `aclocal.m4`, but that doesn’t work with + # autoreconfHook, so cat `config.m4` to another file. Otherwise, it won’t be found by `aclocal`. + cat aclocal/config.m4 >> aclocal/options.m4 + ''; + + # This isn’t pretty. The version information is kept separate from the configure script. + # After the configure script is regenerated, the version information has to be replaced with the + # contents of `dist/RELEASE`. + postAutoreconf = '' + ( + declare -a vars=( + "DB_VERSION_FAMILY" + "DB_VERSION_RELEASE" + "DB_VERSION_MAJOR" + "DB_VERSION_MINOR" + "DB_VERSION_PATCH" + "DB_VERSION_STRING" + "DB_VERSION_FULL_STRING" + "DB_VERSION_UNIQUE_NAME" + "DB_VERSION" + ) + source RELEASE + for var in "''${vars[@]}"; do + sed -e "s/__EDIT_''${var}__/''${!var}/g" -i configure + done + ) + popd + ''; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix index 52928e1005ff..d8c3309acb9f 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.6"; + version = "1.14.8"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-/SvfG7idw2WkZTG/9jFTbyKw0cbVzixcXlm1UmWz1ms="; + sha256 = "sha256-pr1brFzxnww8WUva4lZaCVaWmApoOg7zfLYhLgk73jU="; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; + changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix index 125da383c8d1..0a8b630d073b 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -42,4 +42,8 @@ runCommand "dbus-1" --stringparam apparmor "$apparmor" \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf + + # check if files are empty or only contain space characters + grep -q '[^[:space:]]' "$out/system.conf" || (echo "\"$out/system.conf\" was generated incorrectly and is empty, try building again." && exit 1) + grep -q '[^[:space:]]' "$out/session.conf" || (echo "\"$out/session.conf\" was generated incorrectly and is empty, try building again." && exit 1) '' diff --git a/nixpkgs/pkgs/development/libraries/doctest/default.nix b/nixpkgs/pkgs/development/libraries/doctest/default.nix index 7595eae7d47d..642cfa3052f7 100644 --- a/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }: stdenv.mkDerivation rec { pname = "doctest"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw="; }; + patches = [ + # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`. + # https://github.com//doctest/doctest/pull/768 + (fetchpatch { + url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch"; + hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/nixpkgs/pkgs/development/libraries/dqlite/default.nix index cb7b7466d053..a8d228addc22 100644 --- a/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x76f9Sw3BMgWSY7DLIqDjbggp/qVu8mJBtf4znTz9hA="; + hash = "sha256-GmteQy+nYQFspLvdw44TjuQQeTRQ24OtDeAA+TQJKiU="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix index 4b02b11b3d23..1cc8a843dcd5 100644 --- a/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -15,14 +15,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.6"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI="; fetchSubmodules = true; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jansol ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/tinygltf/default.nix b/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix index 4f965c653850..4f965c653850 100644 --- a/nixpkgs/pkgs/development/libraries/tinygltf/default.nix +++ b/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix index d9e9a1b51c2b..f02dacb95034 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-w01QB3mufeKdo4d0BBm6xiidnnyo9CLpmntT6690leM="; + hash = "sha256-LEv9yURkYvONObTbIA4CS+umwCRMH8gRQaDtzbCzID4="; }; patches = [ ./version.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix index 3fa471b30b2d..3aa6024fc3d1 100644 --- a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; - version = "9.97.0"; + version = "9.97.1"; src = fetchFromGitHub { owner = "amrayn"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; + sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index de54bb746bd6..ec108adc61eb 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -4,10 +4,11 @@ , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support , avx512Support ? stdenv.hostPlatform.avx512Support +, config # Enable NIVIA GPU support # Note, that this needs to be built on a system with a GPU # present for the tests to succeed. -, enableCuda ? false +, enableCuda ? config.cudaSupport # type of GPU architecture , nvidiaArch ? "sm_60" , cudatoolkit @@ -18,13 +19,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2022.11.001"; + version = "2023.05.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-NeOX18CvlbtDvHvvf/8pQlwdpAD6DNhq6NO9L/L52Zk="; + sha256 = "sha256-7GS+XWUigQ1gGjuOajFyDjw+tK8zpDTYpkVw125kYrY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/entt/default.nix b/nixpkgs/pkgs/development/libraries/entt/default.nix index c52d327c611a..44e0b9ed1f05 100644 --- a/nixpkgs/pkgs/development/libraries/entt/default.nix +++ b/nixpkgs/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.11.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-/ZvMyhvnlu/5z4UHhPe8WMXmSA45Kjbr6bRqyVJH310="; + sha256 = "sha256-gzoea3IbmpkIZYrfTZA6YgcnDU5EKdXF5Y7Yz2Uaj4A="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/fastjson/default.nix b/nixpkgs/pkgs/development/libraries/fastjson/default.nix index fe71d56357d7..8cf571e2c931 100644 --- a/nixpkgs/pkgs/development/libraries/fastjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/fastjson/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "1.2304.0"; pname = "fastjson"; + version = "1.2304.0"; + src = fetchFromGitHub { - repo = "libfastjson"; owner = "rsyslog"; - rev = "v${version}"; - sha256 = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4="; + repo = "libfastjson"; + rev = "refs/tags/v${version}"; + hash = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4="; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool ]; - - preConfigure = '' - sh autogen.sh - ''; + nativeBuildInputs = [ + autoreconfHook + ]; meta = with lib; { description = "A fast json library for C"; diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix index 35da314b340a..0bdc2de38992 100644 --- a/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.06"; + version = "23.07"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-V5t9YliyXxoWNnKwp3TTOCyCIzpcyg1X4DaI0WFlfeQ="; + sha256 = "sha256-HGW28mM/rg8VALRoo4iFNHogBkPaVpU80eJh3NmxBqw="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/fb303/default.nix b/nixpkgs/pkgs/development/libraries/fb303/default.nix index d34db81f5f10..aad545ca602f 100644 --- a/nixpkgs/pkgs/development/libraries/fb303/default.nix +++ b/nixpkgs/pkgs/development/libraries/fb303/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "fb303"; - version = "2023.04.24.00"; + version = "2023.06.12.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fb303"; rev = "v${version}"; - sha256 = "sha256-dhqHv+A4uak1FxKNqIsYlQl2WiP5+Y9I83pumpFbJDA="; + sha256 = "sha256-nUOPYb5/tLyHjaZDvKuq0vdu4L7XOmO8R9nNLGAzeLI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/fcft/default.nix b/nixpkgs/pkgs/development/libraries/fcft/default.nix index d4a923add791..4f47c3df8f6d 100644 --- a/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -17,14 +17,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "sha256-3gsaXnflGiGOpIkqDQe5u6x8d18x67/dc4Hh1iU89+o="; + sha256 = "0cfyxf3xcj552bhd5awv5j0lb8xk3xhz87iixp3wnbvsgvl6dpwq"; }; depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 12e59c939afe..a1ca20f9483c 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -34,7 +34,7 @@ , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder , withCrystalhd ? withFullDeps -, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch)) +, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV)) , withCudaLLVM ? withFullDeps , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) @@ -58,8 +58,8 @@ , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer -, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 -, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 +, withNvdec ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) +, withNvenc ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps @@ -330,7 +330,7 @@ assert buildPostproc -> buildAvutil; assert buildSwscale -> buildAvutil; stdenv.mkDerivation (finalAttrs: { - pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}"); + pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}"); inherit version; src = fetchgit { @@ -542,9 +542,10 @@ stdenv.mkDerivation (finalAttrs: { # outputs where we don't want them. Patch the generated config.h to remove all # such references except for data. postConfigure = let - toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir. + toStrip = map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir. + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc; in - "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h"; + "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 5f810ecbe5ed..4c439717bacd 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib +, stdenv +, fetchFromGitHub, fetchpatch +, cmake , enableShared ? !stdenv.hostPlatform.isStatic + +# tests +, mpd +, openimageio +, fcitx5 +, spdlog }: let @@ -27,6 +36,10 @@ let doCheck = true; + passthru.tests = { + inherit mpd openimageio fcitx5 spdlog; + }; + meta = with lib; { description = "Small, safe and fast formatting library"; longDescription = '' @@ -34,6 +47,7 @@ let used as a fast and safe alternative to printf and IOStreams. ''; homepage = "https://fmt.dev/"; + changelog = "https://github.com/fmtlib/fmt/blob/${version}/ChangeLog.rst"; downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; license = licenses.mit; @@ -51,4 +65,16 @@ in version = "9.1.0"; sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0="; }; + + fmt_10 = generic { + version = "10.0.0"; + sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8="; + patches = [ + # fixes a test failure on pkgsMusl.fmt + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/eaa6307691a9edb9e2f2eacf70500fc6989b416c.diff"; + hash = "sha256-PydnmOn/o9DexBViFGUUAO9KFjVS6CN8GVDHcl/+K8g="; + }) + ]; + }; } diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index 6c0b8899a3f4..eadb30352e9a 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , pkg-config , python3 , freetype @@ -14,15 +15,25 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.14.0"; + version = "2.14.2"; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config src = fetchurl { url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; - sha256 = "3L64TJx0u/2xM9U1/hx77cnyIhqNrzkUuYTETFIOm6w="; + hash = "sha256-26aVtXvOFQI9LO7e+CBiwrkl5R9dTMSu9zbPE/YKRos="; }; + patches = [ + # Provide 11-lcdfilter-none.conf for NixOS module + # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/268 + (fetchpatch2 { + name = "add-optional-11-lcdfilter-none-configuration.patch"; + url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/c2666a6d9a6ed18b1bfcef8176e25f62993e24db.patch"; + hash = "sha256-UBzkxy3uxFO+g0aQtPnBZv7OncgQdinwzNwWS8ngjcE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook gperf diff --git a/nixpkgs/pkgs/development/libraries/fpattern/default.nix b/nixpkgs/pkgs/development/libraries/fpattern/default.nix new file mode 100644 index 000000000000..e1b75f025c89 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/fpattern/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation (finalAttrs: { + version = "1.9"; + pname = "fpattern"; + + src = fetchFromGitHub { + owner = "Loadmaster"; + repo = "fpattern"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/QvMQCmoocaXfDm3/c3IAPyfZqR6d7IiJ9UoFKZTpVI="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/include + cp *.c *.h $out/include + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Loadmaster/fpattern"; + description = "Filename pattern matching library functions for DOS, Windows, and Unix"; + license = licenses.mit; + maintainers = with maintainers; [ hughobrien ]; + platforms = with platforms; linux; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index ed847cb3ffea..d96b0e14013c 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] + nativeBuildInputs = [ pkg-config which ] + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ lib.optional (!stdenv.isLinux) gnumake; @@ -60,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postInstall = glib.flattenInclude + '' + postInstall = glib.flattenInclude + # pkgsCross.mingwW64.pkg-config doesn't build + # makeWrapper doesn't cross-compile to windows #120726 + + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' substituteInPlace $dev/bin/freetype-config \ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} diff --git a/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix index dbf5b9c2373e..0215b82a828c 100644 --- a/nixpkgs/pkgs/development/libraries/frei0r/default.nix +++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix @@ -7,7 +7,7 @@ , opencv , pcre , pkg-config -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages }: diff --git a/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/nixpkgs/pkgs/development/libraries/ftxui/default.nix index e9ae2524ca02..1be8d7da74a2 100644 --- a/nixpkgs/pkgs/development/libraries/ftxui/default.nix +++ b/nixpkgs/pkgs/development/libraries/ftxui/default.nix @@ -19,24 +19,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-qFgCLV7sgGxlL18sThqpl+vyXL68GXcbYqMG7mXhsB4="; }; + strictDeps = true; + nativeBuildInputs = [ cmake doxygen graphviz ]; - nativeCheckInputs = [ - gbenchmark + checkInputs = [ gtest + gbenchmark ]; cmakeFlags = [ "-DFTXUI_BUILD_EXAMPLES=OFF" "-DFTXUI_BUILD_DOCS=ON" - "-DFTXUI_BUILD_TESTS=ON" + "-DFTXUI_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { homepage = "https://github.com/ArthurSonzogni/FTXUI"; diff --git a/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix b/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix index b6c7767a8d6f..a3f70c062e86 100644 --- a/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix +++ b/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk="; }; - sourceRoot = "source/fuzzylite"; + sourceRoot = "${src.name}/fuzzylite"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gcab/default.nix b/nixpkgs/pkgs/development/libraries/gcab/default.nix index ad5ef1ced5b8..b31e93553766 100644 --- a/nixpkgs/pkgs/development/libraries/gcab/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcab/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gcab"; - version = "1.5"; + version = "1.6"; outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww="; + url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz"; + hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix index 7c20e2f5c6d2..0f03e9184e19 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -14,7 +14,7 @@ , pango , libsecret , openssh -, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , gobject-introspection , wrapGAppsHook , gi-docgen @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pango libsecret openssh - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (systemdSupport) [ systemd ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!systemdSupport) [ "-Dsystemd=disabled" ]; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 189c6f3a41a6..4b29d8f61838 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -1,8 +1,11 @@ { lib , stdenv +, callPackage , fetchFromGitHub + , bison , cmake +, gtest , doxygen , graphviz , pkg-config @@ -60,15 +63,15 @@ , zstd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.6.4"; + version = "3.7.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "v${version}"; - hash = "sha256-pGdZmQBUuNCk9/scUvq4vduINu5gqtCRLaz7QE2e6WU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-RXX21tCq0xJQli3NTertM9IweONrJfGeaFj3utMFjpM="; }; nativeBuildInputs = [ @@ -88,6 +91,8 @@ stdenv.mkDerivation rec { "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ lib.optionals finalAttrs.doInstallCheck [ + "-DBUILD_TESTING=ON" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so ] ++ lib.optionals stdenv.isDarwin [ @@ -138,6 +143,7 @@ stdenv.mkDerivation rec { libspatialite sqlite libtiff + gtest ] ++ lib.optionals useTiledb [ tiledb ] ++ [ @@ -163,14 +169,20 @@ stdenv.mkDerivation rec { # preCheck rather than preInstallCheck because this is what pytestCheckHook # calls (coming from the python world) preCheck = '' - pushd ../autotest + pushd autotest export HOME=$(mktemp -d) export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH" + export GDAL_DOWNLOAD_TEST_DATA=OFF + # allows to skip tests that fail because of file handle leak + # the issue was not investigated + # https://github.com/OSGeo/gdal/blob/v3.7.0/autotest/gdrivers/bag.py#L61 + export BUILD_NAME=fedora ''; nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook pytest-env + filelock lxml ]; disabledTestPaths = [ @@ -187,7 +199,7 @@ stdenv.mkDerivation rec { "test_transformer_dem_overrride_srs" "test_osr_ct_options_area_of_interest" # ZIP does not support timestamps before 1980 - " test_sentinel2_zipped" + "test_sentinel2_zipped" # tries to call unwrapped executable "test_SetPROJAuxDbPaths" ] ++ lib.optionals (!stdenv.isx86_64) [ @@ -200,17 +212,21 @@ stdenv.mkDerivation rec { "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" ]; postCheck = '' - popd # ../autotest + popd # autotest ''; + passthru.tests = { + gdal = callPackage ./tests.nix { gdal = finalAttrs.finalPackage; }; + }; + __darwinAllowLocalNetworking = true; - meta = { + meta = with lib; { + changelog = "https://github.com/OSGeo/gdal/blob/v${finalAttrs.version}/NEWS.md"; description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - changelog = "https://github.com/OSGeo/gdal/blob/${src.rev}/NEWS.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ marcweber dotlambda ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ marcweber dotlambda ]; + platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/gdal/tests.nix b/nixpkgs/pkgs/development/libraries/gdal/tests.nix new file mode 100644 index 000000000000..37b958706b32 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gdal/tests.nix @@ -0,0 +1,46 @@ +{ runCommand, gdal }: + +let + inherit (gdal) pname version; + +in +runCommand "${pname}-tests" { + nativeBuildInputs = [ gdal ]; + meta.timeout = 60; +} '' + # test version + ogrinfo --version \ + | grep 'GDAL ${version}' + + gdalinfo --version \ + | grep 'GDAL ${version}' + + + # test formats + ogrinfo --formats \ + | grep 'GPKG.*GeoPackage' + + gdalinfo --formats \ + | grep 'GTiff.*GeoTIFF' + + + # test vector file + echo -e "Latitude,Longitude,Name\n48.1,0.25,'Test point'" > test.csv + ogrinfo ./test.csv + + + # test raster file + gdal_create \ + -a_srs "EPSG:4326" \ + -of GTiff \ + -ot UInt16 \ + -a_nodata 255 \ + -burn 0 \ + -outsize 800 600 \ + -co COMPRESS=LZW \ + test.tif + + gdalinfo ./test.tif + + touch $out + '' diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index 333d8196d57f..c3c5b17372e0 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -24,9 +24,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + maintainers = teams.geospatial.members; pkgConfigModules = [ "geos" ]; - maintainers = with lib.maintainers; [ - willcohen - ]; }; }) diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 7be4c3020499..9d8f0fd823f4 100644 --- a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.1"; + version = "0.14.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "7D7j7DhguceJWKVdqJz3auIwWEjhL0GUW3tSEk2PbPk="; + sha256 = "Kgyc9I++izQ1AIhm/9QLjt2wZn0iErQjlv32iOk84L4="; }; nativeBuildInputs = [ @@ -54,11 +54,6 @@ stdenv.mkDerivation rec { "-Dtests=true" ]; - # Needed for darwin due to std::auto_ptr in exiv2 header files & enabling C++ 17 - # https://github.com/Exiv2/exiv2/issues/2359 - # https://gitlab.gnome.org/GNOME/gexiv2/-/issues/73 - env.NIX_CFLAGS_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"; - doCheck = true; preCheck = let diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index 5f9f49f239d9..c38419bed52b 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, automake +, autoconf +, libtool +, autoreconfHook +, gmpxx +}: stdenv.mkDerivation rec { pname = "givaro"; version = "4.2.0"; @@ -8,6 +17,15 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ="; }; + patches = [ + # Pull upstream fix for gcc-13: + # https://github.com/linbox-team/givaro/pull/218 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/linbox-team/givaro/commit/c7744bb133496cd7ac04688f345646d505e1bf52.patch"; + hash = "sha256-aAA5o8Va10v0Pqgcpx7qM0TAZiNQgXoR6N9xecj7tDA="; + }) + ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index 3db1a36e3f3c..55425c6aa7f2 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.76.0"; + version = "1.76.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pj8VaWSxNgU+q1HqATEU59fBk7dRjSjAQLawLDyTOm0="; + sha256 = "sha256-99jJ1lPqb9eK/kpQcg4EaqK/wHj9pjXdEwZ90ZnGJdQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 35091bcbcfcd..8b7c18cf1335 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.76.0"; + version = "2.76.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FJoFoXnmKaU4viVmKqMktJnXxFScUVHbU3PngKG/G5o="; + sha256 = "XGmKmZTd5R79+xAmpWaYoiHWJQ6J3FDrzd2nuBSApCs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 2f50ed4b259d..8a1ba46f50eb 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.76.2"; + version = "2.76.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "JPOEeFex2GdM2wOJo27ewPE8ZmzTznJ+zTQOudqKyp4="; + sha256 = "WloZHJaDbhZqd3H36myisAacYDx9o8uhzTjRaUo5Xdo="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 00b78f57db61..f98c0eb1c348 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -161,14 +161,22 @@ stdenv.mkDerivation ({ ++ lib.optional withGd "--with-gd" ++ lib.optional (!withLibcrypt) "--disable-crypt"; - makeFlags = [ + makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" ]; + postInstall = (args.postInstall or "") + '' + moveToOutput bin/getent $getent + ''; + installFlags = [ "sysconfdir=$(out)/etc" ]; # out as the first output is an exception exclusive to glibc - outputs = [ "out" "bin" "dev" "static" ]; + + # getent is its own output, not kept in bin, since many things + # depend on getent but not on the locale generation tools in the bin + # output. This saves a couple of megabytes of closure size in many cases. + outputs = [ "out" "bin" "dev" "static" "getent" ]; strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -188,7 +196,7 @@ stdenv.mkDerivation ({ passthru = { inherit version; minorRelease = version; }; } -// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // +// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" "makeFlags" ]) // { src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/glibc/default.nix b/nixpkgs/pkgs/development/libraries/glibc/default.nix index 1c0c1b09e154..0f6cad157bb7 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -94,7 +94,7 @@ in "user-defined-trusted-dirs=${stdenv.cc.cc.libgcc}/lib" ]; - postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' + postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} localedata/install-locales '' else lib.optionalString stdenv.buildPlatform.isLinux '' diff --git a/nixpkgs/pkgs/development/libraries/glibc/info.nix b/nixpkgs/pkgs/development/libraries/glibc/info.nix index 04b0dc00a894..d643d8a6ba09 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/info.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/info.nix @@ -9,7 +9,7 @@ callPackage ./common.nix {} { extraNativeBuildInputs = [ texinfo perl ]; - buildPhase = "make info"; + makeFlags = [ "info" ]; # I don't know why the info is not generated in 'build' # Somehow building the info still does not work, because the final diff --git a/nixpkgs/pkgs/development/libraries/glibc/locales.nix b/nixpkgs/pkgs/development/libraries/glibc/locales.nix index ed6f0a5b32ca..86d6d1438b2d 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/locales.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/locales.nix @@ -10,8 +10,9 @@ , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: -callPackage ./common.nix { inherit stdenv; } { +(callPackage ./common.nix { inherit stdenv; } { pname = "glibc-locales"; +}).overrideAttrs(finalAttrs: previousAttrs: { builder = ./locales-builder.sh; @@ -25,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } { else "--big-endian") ]; - buildPhase = '' + preBuild = (previousAttrs.preBuild or "") + '' # Awful hack: `localedef' doesn't allow the path to `locale-archive' # to be overriden, but you *can* specify a prefix, i.e. it will use # <prefix>/<path-to-glibc>/lib/locale/locale-archive. So we use @@ -57,11 +58,15 @@ callPackage ./common.nix { inherit stdenv; } { fi echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED - '' + '' - make localedata/install-locales \ - localedir=$out/lib/locale \ ''; + enableParallelBuilding = true; + + makeFlags = (previousAttrs.makeFlags or []) ++ [ + "localedata/install-locales" + "localedir=${builtins.placeholder "out"}/lib/locale" + ]; + installPhase = '' mkdir -p "$out/lib/locale" "$out/share/i18n" @@ -75,4 +80,4 @@ callPackage ./common.nix { inherit stdenv; } { ''; meta.description = "Locale information for the GNU C Library"; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix index cc6f3b2ecde3..0db1aa27e778 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix @@ -9,19 +9,13 @@ stdenv.mkDerivation rec { pname = "gnome-video-effects"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"; + sha256 = "166utGs/WoMvsuDZC0K/jGFgICylKsmt0Xr84ZLjyKg="; }; - patches = [ - # Fix effectsdir in .pc file - # https://gitlab.gnome.org/GNOME/gnome-video-effects/commit/955404195ada606819974dd63c48956f25611e14 - ./fix-pc-file.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch b/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch deleted file mode 100644 index 62b29e7d025a..000000000000 --- a/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -17,7 +17,7 @@ - # Can't use pkgconfig helper https://github.com/mesonbuild/meson/issues/2253 - conf = configuration_data() - conf.set('prefix', prefix) --conf.set('datarootdir', pkgdatadir) -+conf.set('datarootdir', datadir) - conf.set('VERSION', meson.project_version()) - - pkg = configure_file(configuration: conf, diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index be804859deb5..c0a3219808eb 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -1,5 +1,10 @@ { lib, stdenv, fetchurl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let rev = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3"; diff --git a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix index 1bdd6890ab21..e9746271ea27 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + postPatch = '' + substituteInPlace Make.defaults \ + --replace "-Werror" "" + ''; + passthru.updateScript = gitUpdater { # No nicer place to find latest release. url = "https://git.code.sf.net/p/gnu-efi/code"; diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index f59198a5528e..9067ef71ca05 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; - nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ]; - buildInputs = [ gtk3 cairo glib gobject-introspection ]; + nativeBuildInputs = [ pkg-config gettext gtk-doc python3 gobject-introspection ]; + buildInputs = [ gtk3 cairo glib ]; configureFlags = [ "--disable-python" diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index 1be64b11d991..cb626ffac968 100644 --- a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -125,6 +125,8 @@ stdenv.mkDerivation rec { "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; diff --git a/nixpkgs/pkgs/development/libraries/gr-framework/default.nix b/nixpkgs/pkgs/development/libraries/gr-framework/default.nix new file mode 100644 index 000000000000..415d9c4033bf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gr-framework/default.nix @@ -0,0 +1,65 @@ +{ cairo +, cmake +, fetchFromGitHub +, ffmpeg +, freetype +, ghostscript +, glfw +, lib +, libjpeg +, libtiff +, nix-update-script +, qhull +, qtbase +, stdenv +, wrapQtAppsHook +, xorg +, zeromq +}: + +stdenv.mkDerivation rec { + pname = "gr-framework"; + version = "0.72.9"; + + src = fetchFromGitHub { + owner = "sciapp"; + repo = "gr"; + rev = "v${version}"; + hash = "sha256-4rOcrMn0sxTeRQqiQMAWULzUV39i6J96Mb096Lyblns="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + cairo + ffmpeg + freetype + ghostscript + glfw + libjpeg + libtiff + qhull + qtbase + xorg.libX11 + xorg.libXft + xorg.libXt + zeromq + ]; + + preConfigure = '' + echo ${version} > version.txt + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GR framework is a graphics library for visualisation applications"; + homepage = "https://gr-framework.org"; + maintainers = [ lib.maintainers.paveloom ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 65498357b5d0..1e2eddf27519 100644 --- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -7,23 +7,21 @@ , stress-ng }: -lib.fix (self: stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; version = "11"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU="; }; doCheck = true; nativeCheckInputs = [ python3 ]; # these tests cover use as a build-time-linked library - checkPhase = '' - make test - ''; + checkTarget = "test"; installPhase = '' install -Dm444 -t $out/include include/* @@ -38,8 +36,8 @@ lib.fix (self: stdenv.mkDerivation rec { passthru = { ld-preload-tests = stdenv.mkDerivation { - name = "${self.name}-ld-preload-tests"; - src = self.src; + name = "${finalAttrs.pname}-ld-preload-tests"; + inherit (finalAttrs) src; nativeBuildInputs = [ makeWrapper ]; @@ -66,13 +64,13 @@ lib.fix (self: stdenv.mkDerivation rec { ''; }; tests = { - ld-preload = runCommand "ld-preload-test-run" {} '' - ${self}/bin/preload-hardened-malloc ${self.ld-preload-tests}/bin/run-tests + ld-preload = runCommand "ld-preload-test-run" { } '' + ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${finalAttrs.passthru.ld-preload-tests}/bin/run-tests touch $out ''; # to compensate for the lack of tests of correct normal malloc operation - stress = runCommand "stress-test-run" {} '' - ${self}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ + stress = runCommand "stress-test-run" { } '' + ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ --no-rand-seed \ --malloc 8 \ --malloc-ops 1000000 \ diff --git a/nixpkgs/pkgs/development/libraries/gsl/default.nix b/nixpkgs/pkgs/development/libraries/gsl/default.nix index c9559476eff2..ffe168674e68 100644 --- a/nixpkgs/pkgs/development/libraries/gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsl/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = lib.platforms.unix; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix index d3ddb25ed0e9..fa7eb93fe0c6 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.12.1"; + version = "1.12.2"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jsRPMgUuiW/N1JJuuBSjJuOaUEfiUe7HuQVvvZREsPE="; + sha256 = "tOmTvYJ+TOtqdwsbXolQ/OO+nIsrDL6yL9+ZKAjdITk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index ccfbd892a97d..f10d90a0454b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,6 +14,8 @@ , enableZbar ? false , faacSupport ? false , faac +, opencvSupport ? false +, opencv4 , faad2 , ldacbt , libass @@ -54,7 +56,6 @@ , libusb1 , neon , openal -, opencv4 , openexr_3 , openh264 , libopenmpt @@ -108,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-4XmP7i2GEn8GN0gcYH+YMpO/D9garXClx7RyBa82Idg="; + hash = "sha256-6q9TIkVl6qvVBco5xtV2lxm0V5XPUyzhzrYOGy6+maw="; }; patches = [ @@ -171,7 +172,6 @@ stdenv.mkDerivation rec { libusb1 neon openal - opencv4 openexr_3 openh264 rtmpdump @@ -192,6 +192,9 @@ stdenv.mkDerivation rec { libfreeaptx zxing-cpp usrsctp + wildmidi + ] ++ lib.optionals opencvSupport [ + opencv4 ] ++ lib.optionals enableZbar [ zbar ] ++ lib.optionals faacSupport [ @@ -210,9 +213,6 @@ stdenv.mkDerivation rec { wayland wayland-protocols ] ++ lib.optionals (!stdenv.isDarwin) [ - # wildmidi requires apple's OpenAL - # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin mjpegtools @@ -292,6 +292,7 @@ stdenv.mkDerivation rec { "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` + "-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true` "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}" "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" (lib.mesonEnable "doc" enableDocumentation) @@ -315,7 +316,6 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - "-Dwildmidi=disabled" # see dependencies above ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [ "-Dqsv=disabled" # Linux (and Windows) x86 only ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 5c70b225e526..1b8d569f56ac 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-HFliiaDUIHOAIz66jDapMsTRrOuhmTKTfZtXwkzvifM="; + hash = "sha256-KSQk6C3qFwUoxCtFb2KolTK8q8BQjxkuNGcvuG9o5bg="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index e6c9d2222d18..1478e96120fc 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n/6rlQU/n2mV6zs9oiXojyHBKc1g2gAtP3ldtw1tWXQ="; + hash = "sha256-EcsEmLwWuT2LmdIvdfgpuNCr/YJUhAshIGGNtVMtxlU="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 8837a0a0e93d..b194d6e82753 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RGrJxC1QLL/ZCBc3zBuFOzwfUNt3ynzNAa6hD2h1UME="; + hash = "sha256-TFIFPOjB33L9gXIen1PeOxRu3PLeKPYHvnBbzkz5CdE="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index e5f8ed02061a..cc1244b1ecae 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FaW85iUJseEl6FoJ7EHzIcD1SSZLUETACV/PstXAzqI="; + hash = "sha256-RThGz6RxoMHIAUVRvUhPvPM08ORDBZIxevuyN3Xmm9I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index ef6143b36ec9..bf847987a029 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -34,13 +34,10 @@ , qt6Support ? false, qt6 , raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 -, libXdamage -, libXext -, libXfixes +, enableX11 ? stdenv.isLinux, xorg , ncurses , wayland , wayland-protocols -, xorg , libgudev , wavpack , glib @@ -48,17 +45,19 @@ , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); +# MMAL is not supported on aarch64, see: +# https://github.com/raspberrypi/userland/issues/688 +assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-r4EVSzou8/TS/ro5XyVpb+6m/RPsYsktPHqXNHBxAnM="; + hash = "sha256-1xIMEUap1yPVPVv+gHTaJXWoHwWYQ4dSk385u3yDO2o="; }; strictDeps = true; @@ -105,15 +104,14 @@ stdenv.mkDerivation rec { mpg123 twolame libintl - libXdamage - libXext - libXfixes ncurses - xorg.libXfixes - xorg.libXdamage wavpack ] ++ lib.optionals raspiCameraSupport [ libraspberrypi + ] ++ lib.optionals enableX11 [ + xorg.libXext + xorg.libXfixes + xorg.libXdamage ] ++ lib.optionals gtkSupport [ # for gtksink gtk3 @@ -149,6 +147,8 @@ stdenv.mkDerivation rec { "-Dqt6=disabled" ] ++ lib.optionals (!gtkSupport) [ "-Dgtk3=disabled" + ] ++ lib.optionals (!enableX11) [ + "-Dximagesrc=disabled" # Linux-only ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ @@ -158,10 +158,11 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # TODO check if we can keep this enabled "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only - "-Dximagesrc=disabled" # Linux-only - ] ++ lib.optionals (!raspiCameraSupport) [ + ] ++ (if raspiCameraSupport then [ + "-Drpi-lib-dir=${libraspberrypi}/lib" + ] else [ "-Drpicamsrc=disabled" - ]; + ]); postPatch = '' patchShebangs \ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index f7ef0018cb25..b03dd953e140 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = [ + "-Wno-error" # gstcameradeinterlace.cpp:55:10: fatal error: gst/video/video.h: No such file or directory "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index a1271fab91f4..c2fee6d1ea6b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-LsXIBYCLQ3Gn4ysdoCAqHIprNrbOkFCAv1w0CX0SqSM="; + hash = "sha256-mnUbx0Dedo55HDepXwqSTGpB0S/X839UzmpOg0vhItM="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock b/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock index 6a226059966b..976126eecb53 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock @@ -1,10 +1,15 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. version = 3 + [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ "gimli",] +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] [[package]] name = "adler" @@ -17,89 +22,133 @@ name = "aes" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ "aes-soft", "aesni", "cipher",] +dependencies = [ + "aes-soft", + "aesni", + "cipher", +] [[package]] name = "aes-ctr" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763" -dependencies = [ "aes-soft", "aesni", "cipher", "ctr",] +dependencies = [ + "aes-soft", + "aesni", + "cipher", + "ctr", +] [[package]] name = "aes-soft" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ "cipher", "opaque-debug",] +dependencies = [ + "cipher", + "opaque-debug", +] [[package]] name = "aesni" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ "cipher", "opaque-debug",] +dependencies = [ + "cipher", + "opaque-debug", +] [[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ "getrandom", "once_cell", "version_check",] +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ "memchr",] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ "libc",] +dependencies = [ + "libc", +] [[package]] name = "anstream" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", "is-terminal", "utf8parse",] +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ "utf8parse",] +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] [[package]] name = "anstyle-query" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ "windows-sys 0.48.0",] +dependencies = [ + "windows-sys", +] [[package]] name = "anstyle-wincon" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ "anstyle", "windows-sys 0.48.0",] +dependencies = [ + "anstyle", + "windows-sys", +] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arbitrary" @@ -112,28 +161,44 @@ name = "arg_enum_proc_macro" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c29b43ee8654590587cd033b3eca2f9c4f8cdff945ec0e6ee91ceb057d87f3" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109",] +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -dependencies = [ "serde",] +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ "flate2", "futures-core", "memchr", "pin-project-lite", "tokio",] +checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] [[package]] name = "async-recursion" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "async-task" @@ -143,17 +208,30 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "async-tungstenite" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a48bf42ab2178374a79853bceef600e279258c75049b20481b022d73c908882" -dependencies = [ "futures-io", "futures-util", "log", "native-tls", "pin-project-lite", "tokio", "tokio-native-tls", "tungstenite",] +checksum = "ce01ac37fdc85f10a43c43bc582cbd566720357011578a935761075f898baf58" +dependencies = [ + "futures-io", + "futures-util", + "log", + "native-tls", + "pin-project-lite", + "tokio", + "tokio-native-tls", + "tungstenite", +] [[package]] name = "atomic_refcell" @@ -166,7 +244,11 @@ name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ "hermit-abi 0.1.19", "libc", "winapi",] +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] [[package]] name = "autocfg" @@ -179,168 +261,431 @@ name = "av1-grain" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f6ca6f0c18c02c2fbfc119df551b8aeb8a385f6d5980f1475ba0255f1e97f1e" -dependencies = [ "anyhow", "arrayvec", "itertools", "log", "nom", "num-rational", "serde", "v_frame",] +dependencies = [ + "anyhow", + "arrayvec", + "itertools 0.10.5", + "log", + "nom", + "num-rational", + "serde", + "v_frame", +] [[package]] name = "aws-config" -version = "0.55.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc00553f5f3c06ffd4510a9d576f92143618706c45ea6ff81e84ad9be9588abd" -dependencies = [ "aws-credential-types", "aws-http", "aws-sdk-sso", "aws-sdk-sts", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-types", "aws-types", "bytes", "fastrand", "hex", "http", "hyper", "ring", "time 0.3.20", "tokio", "tower", "tracing", "zeroize",] +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sdk-sso", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 1.9.0", + "hex", + "http", + "hyper", + "ring", + "time 0.3.20", + "tokio", + "tower", + "tracing", + "zeroize", +] [[package]] name = "aws-credential-types" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cb57ac6088805821f78d282c0ba8aec809f11cbee10dda19a97b03ab040ccc2" -dependencies = [ "aws-smithy-async", "aws-smithy-types", "fastrand", "tokio", "tracing", "zeroize",] +checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "fastrand 1.9.0", + "tokio", + "tracing", + "zeroize", +] [[package]] name = "aws-endpoint" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5f6f84a4f46f95a9bb71d9300b73cd67eb868bc43ae84f66ad34752299f4ac" -dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", "http", "regex", "tracing",] +checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "http", + "regex", + "tracing", +] [[package]] name = "aws-http" -version = "0.55.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a754683c322f7dc5167484266489fdebdcd04d26e53c162cad1f3f949f2c5671" -dependencies = [ "aws-credential-types", "aws-smithy-http", "aws-smithy-types", "aws-types", "bytes", "http", "http-body", "lazy_static", "percent-encoding", "pin-project-lite", "tracing",] +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" +dependencies = [ + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "http-body", + "lazy_static", + "percent-encoding", + "pin-project-lite", + "tracing", +] [[package]] name = "aws-sdk-s3" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c77060408d653d3efa6ea7b66c1389bc35a0342352984c8bf8bcb814a8fc27" -dependencies = [ "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", "aws-sigv4", "aws-smithy-async", "aws-smithy-checksums", "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes", "http", "http-body", "once_cell", "percent-encoding", "regex", "tokio-stream", "tower", "tracing", "url",] +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba197193cbb4bcb6aad8d99796b2291f36fa89562ded5d4501363055b0de89f" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-client", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "http", + "http-body", + "once_cell", + "percent-encoding", + "regex", + "tokio-stream", + "tower", + "tracing", + "url", +] [[package]] name = "aws-sdk-sso" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "babfd626348836a31785775e3c08a4c345a5ab4c6e06dfd9167f2bee0e6295d6" -dependencies = [ "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-types", "aws-types", "bytes", "http", "regex", "tokio-stream", "tower", "tracing",] +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tokio-stream", + "tower", + "tracing", +] [[package]] name = "aws-sdk-sts" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0fbe3c2c342bc8dfea4bb43937405a8ec06f99140a0dcb9c7b59e54dfa93a1" -dependencies = [ "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-query", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes", "http", "regex", "tower", "tracing",] +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "http", + "regex", + "tower", + "tracing", +] [[package]] name = "aws-sdk-transcribe" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9793902457988cb3915eb9e57b509c8da10aa3a89a8949eabe4ebbb5f6625a40" -dependencies = [ "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-types", "aws-types", "bytes", "http", "regex", "tokio-stream", "tower", "tracing",] +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b561d56e7989062837c92f3cee6802f1b9cdb81b248bcc47790e38de1b96ab" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tokio-stream", + "tower", + "tracing", +] [[package]] name = "aws-sig-auth" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84dc92a63ede3c2cbe43529cb87ffa58763520c96c6a46ca1ced80417afba845" -dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-eventstream", "aws-smithy-http", "aws-types", "http", "tracing",] +checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-types", + "http", + "tracing", +] [[package]] name = "aws-sigv4" -version = "0.55.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "392fefab9d6fcbd76d518eb3b1c040b84728ab50f58df0c3c53ada4bea9d327e" -dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", "bytes", "form_urlencoded", "hex", "hmac 0.12.1", "http", "once_cell", "percent-encoding", "regex", "sha2", "time 0.3.20", "tracing",] +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-http", + "bytes", + "form_urlencoded", + "hex", + "hmac 0.12.1", + "http", + "once_cell", + "percent-encoding", + "regex", + "sha2", + "time 0.3.20", + "tracing", +] [[package]] name = "aws-smithy-async" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae23b9fe7a07d0919000116c4c5c0578303fbce6fc8d32efca1f7759d4c20faf" -dependencies = [ "futures-util", "pin-project-lite", "tokio", "tokio-stream",] +checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", +] [[package]] name = "aws-smithy-checksums" -version = "0.55.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6367acbd6849b8c7c659e166955531274ae147bf83ab4312885991f6b6706cb" -dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", "crc32c", "crc32fast", "hex", "http", "http-body", "md-5", "pin-project-lite", "sha1", "sha2", "tracing",] +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc32c", + "crc32fast", + "hex", + "http", + "http-body", + "md-5", + "pin-project-lite", + "sha1", + "sha2", + "tracing", +] [[package]] name = "aws-smithy-client" -version = "0.55.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230d25d244a51339273b8870f0f77874cd4449fb4f8f629b21188ae10cfc0ba" -dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", "bytes", "fastrand", "http", "http-body", "hyper", "hyper-rustls", "lazy_static", "pin-project-lite", "rustls", "tokio", "tower", "tracing",] +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-types", + "bytes", + "fastrand 1.9.0", + "http", + "http-body", + "hyper", + "hyper-rustls", + "lazy_static", + "pin-project-lite", + "rustls", + "tokio", + "tower", + "tracing", +] [[package]] name = "aws-smithy-eventstream" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d2a2bcc16e5c4d949ffd2b851da852b9bbed4bb364ed4ae371b42137ca06d9" -dependencies = [ "aws-smithy-types", "bytes", "crc32fast",] +checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] [[package]] name = "aws-smithy-http" -version = "0.55.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60e2133beb9fe6ffe0b70deca57aaeff0a35ad24a9c6fab2fd3b4f45b99fdb5" -dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", "bytes", "bytes-utils", "futures-core", "http", "http-body", "hyper", "once_cell", "percent-encoding", "pin-project-lite", "pin-utils", "tokio", "tokio-util", "tracing",] +version = "0.55.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "hyper", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tokio", + "tokio-util", + "tracing", +] [[package]] name = "aws-smithy-http-tower" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4d94f556c86a0dd916a5d7c39747157ea8cb909ca469703e20fee33e448b67" -dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", "http", "http-body", "pin-project-lite", "tower", "tracing",] +checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tower", + "tracing", +] [[package]] name = "aws-smithy-json" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3d6e6ebb00b2cce379f079ad5ec508f9bcc3a9510d9b9c1840ed1d6f8af39" -dependencies = [ "aws-smithy-types",] +checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" +dependencies = [ + "aws-smithy-types", +] [[package]] name = "aws-smithy-query" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58edfca32ef9bfbc1ca394599e17ea329cb52d6a07359827be74235b64b3298" -dependencies = [ "aws-smithy-types", "urlencoding",] +checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] [[package]] name = "aws-smithy-types" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58db46fc1f4f26be01ebdb821751b4e2482cd43aa2b64a0348fb89762defaffa" -dependencies = [ "base64-simd", "itoa", "num-integer", "ryu", "time 0.3.20",] +checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" +dependencies = [ + "base64-simd", + "itoa", + "num-integer", + "ryu", + "time 0.3.20", +] [[package]] name = "aws-smithy-xml" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb557fe4995bd9ec87fb244bbb254666a971dc902a783e9da8b7711610e9664c" -dependencies = [ "xmlparser",] +checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" +dependencies = [ + "xmlparser", +] [[package]] name = "aws-types" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0869598bfe46ec44ffe17e063ed33336e59df90356ca8ff0e8da6f7c1d994b" -dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", "http", "rustc_version", "tracing",] +checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-types", + "http", + "rustc_version", + "tracing", +] [[package]] name = "backoff" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ "futures-core", "getrandom", "instant", "pin-project-lite", "rand", "tokio",] +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ "addr2line", "cc", "cfg-if", "libc", "miniz_oxide 0.6.2", "object", "rustc-demangle",] +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base32" @@ -356,55 +701,64 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64-simd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ "outref", "vsimd",] +dependencies = [ + "outref", + "vsimd", +] [[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ "serde",] +dependencies = [ + "serde", +] [[package]] -name = "bit_field" -version = "0.10.2" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "bitstream-io" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" +checksum = "82704769cb85a22df2c54d6bdd6a158b7931d256cf3248a07d6ecbe9d58b31d7" [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ "generic-array",] +dependencies = [ + "generic-array", +] [[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ "generic-array",] +dependencies = [ + "generic-array", +] [[package]] name = "build_const" @@ -417,13 +771,15 @@ name = "built" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" -dependencies = [ "cargo-lock",] +dependencies = [ + "cargo-lock", +] [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-slice-cast" @@ -454,33 +810,54 @@ name = "bytes-utils" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" -dependencies = [ "bytes", "either",] +dependencies = [ + "bytes", + "either", +] [[package]] name = "cairo-rs" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "bitflags", "cairo-sys-rs", "glib", "libc", "once_cell", "thiserror",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] [[package]] name = "cairo-sys-rs" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "glib-sys", "libc", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] [[package]] name = "cargo-lock" version = "8.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" -dependencies = [ "semver", "serde", "toml 0.5.11", "url",] +dependencies = [ + "semver", + "serde", + "toml 0.5.11", + "url", +] [[package]] name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ "jobserver",] +dependencies = [ + "jobserver", +] [[package]] name = "cdg" @@ -493,14 +870,20 @@ name = "cdg_renderer" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3753104c2ef8672021f3355a59ab5944d7aa5472f970b5d97e93bd741d79af96" -dependencies = [ "cdg", "image",] +dependencies = [ + "cdg", + "image", +] [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" -dependencies = [ "smallvec", "target-lexicon",] +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +dependencies = [ + "smallvec", + "target-lexicon", +] [[package]] name = "cfg-if" @@ -510,44 +893,68 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", "time 0.1.45", "wasm-bindgen", "winapi",] +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] [[package]] name = "cipher" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ "generic-array",] +dependencies = [ + "generic-array", +] [[package]] name = "clap" -version = "4.2.7" +version = "4.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" -dependencies = [ "clap_builder", "clap_derive", "once_cell",] +checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" -dependencies = [ "anstream", "anstyle", "bitflags", "clap_lex", "strsim",] +checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ "heck", "proc-macro2", "quote", "syn 2.0.15",] +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "claxon" @@ -556,13 +963,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ "termcolor", "unicode-width",] - -[[package]] name = "color-name" version = "1.1.0" source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a" @@ -572,7 +972,9 @@ name = "color-thief" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6460d760cf38ce67c9e0318f896538820acc54f2d0a3bfc5b2c557211066c98" -dependencies = [ "rgb",] +dependencies = [ + "rgb", +] [[package]] name = "color_quant" @@ -591,28 +993,47 @@ name = "concurrent-queue" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ "crossbeam-utils",] +dependencies = [ + "crossbeam-utils", +] [[package]] name = "cookie" version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" -dependencies = [ "percent-encoding", "time 0.3.20", "version_check",] +dependencies = [ + "percent-encoding", + "time 0.3.20", + "version_check", +] [[package]] name = "cookie_store" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4b6aa369f41f5faa04bb80c9b1f4216ea81646ed6124d76ba5c49a7aafd9cd" -dependencies = [ "cookie", "idna 0.2.3", "log", "publicsuffix", "serde", "serde_json", "time 0.3.20", "url",] +checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time 0.3.20", + "url", +] [[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ "core-foundation-sys", "libc",] +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "core-foundation-sys" @@ -622,24 +1043,30 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ "libc",] +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] [[package]] name = "crc" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" -dependencies = [ "build_const",] +dependencies = [ + "build_const", +] [[package]] name = "crc" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ "crc-catalog",] +dependencies = [ + "crc-catalog", +] [[package]] name = "crc-catalog" @@ -652,124 +1079,121 @@ name = "crc32c" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" -dependencies = [ "rustc_version",] +dependencies = [ + "rustc_version", +] [[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ "cfg-if",] +dependencies = [ + "cfg-if", +] [[package]] name = "crossbeam-channel" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ "cfg-if", "crossbeam-utils",] +dependencies = [ + "cfg-if", + "crossbeam-utils", +] [[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ "cfg-if", "crossbeam-epoch", "crossbeam-utils",] +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset 0.8.0", "scopeguard",] +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] [[package]] name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ "cfg-if",] - -[[package]] -name = "crunchy" -version = "0.2.2" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] [[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ "generic-array", "typenum",] +dependencies = [ + "generic-array", + "typenum", +] [[package]] name = "crypto-mac" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ "generic-array", "subtle",] +dependencies = [ + "generic-array", + "subtle", +] [[package]] name = "csound" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d49045d7365f5c2cadb1f20932189a0da101ac86c8dbe891975814b2348d57d" -dependencies = [ "bitflags", "csound-sys", "libc", "va_list",] +dependencies = [ + "bitflags 1.3.2", + "csound-sys", + "libc", + "va_list", +] [[package]] name = "csound-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b11869eaed111b64d29e66cc5c7de9f172d5b623b716eb74c5dd841dbcfe39" -dependencies = [ "libc", "va_list",] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ "quote", "syn 1.0.109",] +dependencies = [ + "libc", + "va_list", +] [[package]] name = "ctr" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ "cipher",] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ "cc", "cxxbridge-flags", "cxxbridge-macro", "link-cplusplus",] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ "cc", "codespan-reporting", "once_cell", "proc-macro2", "quote", "scratch", "syn 2.0.15",] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +dependencies = [ + "cipher", +] [[package]] name = "dasp_frame" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6" -dependencies = [ "dasp_sample",] +dependencies = [ + "dasp_sample", +] [[package]] name = "dasp_sample" @@ -779,23 +1203,29 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "dav1d" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02ab20a37bcd596fb85c3185c3286f983fc6125755c74625c7849c2ba0b7bb3" -dependencies = [ "bitflags", "dav1d-sys",] +checksum = "87ca43c8e58ee931086b5fd9a4b6a8cc40c1346592246c4fe3d299eca1684c75" +dependencies = [ + "bitflags 2.3.3", + "dav1d-sys", +] [[package]] name = "dav1d-sys" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615542bb14c18b795f46aba92258902168218d714090f5fff47e68c9a352ea2d" -dependencies = [ "libc", "system-deps",] +dependencies = [ + "libc", + "system-deps", +] [[package]] name = "diff" @@ -808,35 +1238,53 @@ name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ "generic-array",] +dependencies = [ + "generic-array", +] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ "block-buffer 0.10.4", "crypto-common", "subtle",] +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] [[package]] name = "dssim-core" -version = "3.2.6" +version = "3.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60aa0237471586cfb40481b3855a897b86d380eae78fe852d844ab1e3d1d896b" -dependencies = [ "imgref", "itertools", "rayon", "rgb",] +checksum = "1388544389475fcfd718b35a286af17cb215202af26bf2067d0e1024adbc3fe9" +dependencies = [ + "imgref", + "itertools 0.11.0", + "rayon", + "rgb", +] [[package]] name = "ebur128" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12aebdd6b6b47b5880c049efb0e77f8762178a0745ef778878908f5981c05f52" -dependencies = [ "bitflags", "dasp_frame", "dasp_sample", "smallvec",] +dependencies = [ + "bitflags 1.3.2", + "dasp_frame", + "dasp_sample", + "smallvec", +] [[package]] name = "ed25519" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ "signature",] +dependencies = [ + "signature", +] [[package]] name = "either" @@ -849,69 +1297,105 @@ name = "encoding_rs" version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ "cfg-if",] +dependencies = [ + "cfg-if", +] [[package]] name = "env_logger" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ "atty", "humantime", "log", "termcolor",] +dependencies = [ + "atty", + "humantime", + "log", + "termcolor", +] [[package]] name = "env_logger" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ "humantime", "is-terminal", "log", "regex", "termcolor",] +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ "errno-dragonfly", "libc", "windows-sys 0.48.0",] +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] [[package]] name = "errno-dragonfly" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ "cc", "libc",] +dependencies = [ + "cc", + "libc", +] [[package]] -name = "exr" -version = "1.6.3" +name = "fastrand" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" -dependencies = [ "bit_field", "flume", "half", "lebe", "miniz_oxide 0.6.2", "rayon-core", "smallvec", "zune-inflate",] +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ "instant",] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ "simd-adler32",] +dependencies = [ + "simd-adler32", +] [[package]] name = "ffv1" version = "0.0.0" source = "git+https://github.com/rust-av/ffv1.git?rev=2afb025a327173ce891954c052e804d0f880368a#2afb025a327173ce891954c052e804d0f880368a" -dependencies = [ "crc 1.8.1", "num-traits", "thiserror",] +dependencies = [ + "crc 1.8.1", + "num-traits", + "thiserror", +] [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" -dependencies = [ "memoffset 0.8.0", "rustc_version",] +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.0", + "rustc_version", +] [[package]] name = "fixedbitset" @@ -924,20 +1408,31 @@ name = "flate2" version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ "crc32fast", "miniz_oxide 0.7.1",] +dependencies = [ + "crc32fast", + "miniz_oxide", +] [[package]] name = "flavors" version = "0.2.0" source = "git+https://github.com/rust-av/flavors#833508af656d298c269f2397c8541a084264d992" -dependencies = [ "nom",] +dependencies = [ + "nom", +] [[package]] name = "flume" version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ "futures-core", "futures-sink", "nanorand", "pin-project", "spin 0.9.8",] +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] [[package]] name = "fnv" @@ -950,7 +1445,9 @@ name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ "foreign-types-shared",] +dependencies = [ + "foreign-types-shared", +] [[package]] name = "foreign-types-shared" @@ -960,10 +1457,12 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ "percent-encoding",] +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] [[package]] name = "fst" @@ -976,14 +1475,25 @@ name = "futures" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ "futures-channel", "futures-core", "futures-executor", "futures-io", "futures-sink", "futures-task", "futures-util",] +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] [[package]] name = "futures-channel" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ "futures-core", "futures-sink",] +dependencies = [ + "futures-core", + "futures-sink", +] [[package]] name = "futures-core" @@ -996,7 +1506,11 @@ name = "futures-executor" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ "futures-core", "futures-task", "futures-util",] +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] [[package]] name = "futures-io" @@ -1009,7 +1523,11 @@ name = "futures-macro" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "futures-sink" @@ -1028,119 +1546,269 @@ name = "futures-util" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ "futures-channel", "futures-core", "futures-io", "futures-macro", "futures-sink", "futures-task", "memchr", "pin-project-lite", "pin-utils", "slab",] +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] [[package]] name = "gdk-pixbuf" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "bitflags", "gdk-pixbuf-sys", "gio", "glib", "libc", "once_cell",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] [[package]] name = "gdk-pixbuf-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] [[package]] name = "gdk4" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", "gio", "glib", "libc", "pango",] +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] [[package]] name = "gdk4-sys" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", "glib-sys", "gobject-sys", "libc", "pango-sys", "pkg-config", "system-deps",] +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] [[package]] name = "gdk4-wayland" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "gdk4", "gdk4-wayland-sys", "gio", "glib", "libc",] +dependencies = [ + "gdk4", + "gdk4-wayland-sys", + "gio", + "glib", + "libc", +] [[package]] name = "gdk4-wayland-sys" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "glib-sys", "libc", "system-deps",] +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4-win32" +version = "0.6.6" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +dependencies = [ + "gdk4", + "gdk4-win32-sys", + "gio", + "glib", + "khronos-egl", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4-win32-sys" +version = "0.6.6" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "glib-sys", + "libc", + "system-deps", +] [[package]] name = "gdk4-x11" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "gdk4", "gdk4-x11-sys", "gio", "glib", "libc",] +dependencies = [ + "gdk4", + "gdk4-x11-sys", + "gio", + "glib", + "libc", +] [[package]] name = "gdk4-x11-sys" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "gdk4-sys", "glib-sys", "libc", "system-deps",] +dependencies = [ + "gdk4-sys", + "glib-sys", + "libc", + "system-deps", +] [[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ "typenum", "version_check",] +dependencies = [ + "typenum", + "version_check", +] [[package]] name = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ "unicode-width",] +dependencies = [ + "unicode-width", +] [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ "cfg-if", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen",] +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] [[package]] name = "gif" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ "color_quant", "weezl",] +dependencies = [ + "color_quant", + "weezl", +] [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "gio" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", "futures-util", "gio-sys", "glib", "libc", "once_cell", "pin-project-lite", "smallvec", "thiserror",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] [[package]] name = "gio-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", "winapi",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] [[package]] name = "glib" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", "gio-sys", "glib-macros", "glib-sys", "gobject-sys", "libc", "memchr", "once_cell", "smallvec", "thiserror",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] [[package]] name = "glib-macros" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", "syn 1.0.109",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "glib-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "libc", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "libc", + "system-deps", +] [[package]] name = "glob" @@ -1150,492 +1818,1309 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "glib-sys", "libc", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] [[package]] name = "graphene-rs" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "glib", "graphene-sys", "libc",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] [[package]] name = "graphene-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "glib-sys", "libc", "pkg-config", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] [[package]] name = "gsk4" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "bitflags", "cairo-rs", "gdk4", "glib", "graphene-rs", "gsk4-sys", "libc", "pango",] +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] [[package]] name = "gsk4-sys" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "cairo-sys-rs", "gdk4-sys", "glib-sys", "gobject-sys", "graphene-sys", "libc", "pango-sys", "system-deps",] +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] [[package]] name = "gst-plugin-audiofx" -version = "0.10.7" -dependencies = [ "anyhow", "atomic_refcell", "byte-slice-cast", "ebur128", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "hrtf", "nnnoiseless", "num-traits", "once_cell", "rayon", "smallvec",] +version = "0.10.11" +dependencies = [ + "anyhow", + "atomic_refcell", + "byte-slice-cast", + "ebur128", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "hrtf", + "nnnoiseless", + "num-traits", + "once_cell", + "rayon", + "smallvec", +] [[package]] name = "gst-plugin-aws" -version = "0.10.7" -dependencies = [ "async-tungstenite", "atomic_refcell", "aws-config", "aws-credential-types", "aws-sdk-s3", "aws-sdk-transcribe", "aws-sig-auth", "aws-smithy-http", "aws-smithy-types", "aws-types", "backoff", "base32", "byteorder", "bytes", "chrono", "crc 3.0.1", "env_logger 0.10.0", "futures", "gio", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "http", "nom", "once_cell", "percent-encoding", "rand", "serde", "serde_derive", "serde_json", "test-with", "tokio", "url",] +version = "0.10.11" +dependencies = [ + "async-tungstenite", + "atomic_refcell", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "aws-sdk-transcribe", + "aws-sig-auth", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "backoff", + "base32", + "byteorder", + "bytes", + "chrono", + "crc 3.0.1", + "env_logger 0.10.0", + "futures", + "gio", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "http", + "nom", + "once_cell", + "percent-encoding", + "rand", + "serde", + "serde_derive", + "serde_json", + "test-with", + "tokio", + "url", +] [[package]] name = "gst-plugin-cdg" -version = "0.10.7" -dependencies = [ "cdg", "cdg_renderer", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "gstreamer-base", "gstreamer-video", "image", "muldiv", "once_cell",] +version = "0.10.11" +dependencies = [ + "cdg", + "cdg_renderer", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-base", + "gstreamer-video", + "image", + "muldiv", + "once_cell", +] [[package]] name = "gst-plugin-claxon" -version = "0.10.7" -dependencies = [ "atomic_refcell", "byte-slice-cast", "claxon", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-check", "once_cell",] +version = "0.10.11" +dependencies = [ + "atomic_refcell", + "byte-slice-cast", + "claxon", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-check", + "once_cell", +] [[package]] name = "gst-plugin-closedcaption" -version = "0.10.7" -dependencies = [ "anyhow", "atomic_refcell", "byteorder", "cairo-rs", "cc", "chrono", "either", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-check", "gstreamer-video", "nom", "once_cell", "pango", "pangocairo", "pretty_assertions", "rand", "serde", "serde_json", "uuid",] +version = "0.10.11" +dependencies = [ + "anyhow", + "atomic_refcell", + "byteorder", + "cairo-rs", + "cc", + "chrono", + "either", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-check", + "gstreamer-video", + "nom", + "once_cell", + "pango", + "pangocairo", + "pretty_assertions", + "rand", + "serde", + "serde_json", + "uuid", +] [[package]] name = "gst-plugin-csound" -version = "0.10.7" -dependencies = [ "byte-slice-cast", "csound", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "once_cell",] +version = "0.10.11" +dependencies = [ + "byte-slice-cast", + "csound", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "once_cell", +] [[package]] name = "gst-plugin-dav1d" -version = "0.10.7" -dependencies = [ "dav1d", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-video", "num_cpus", "once_cell",] +version = "0.10.11" +dependencies = [ + "dav1d", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-video", + "num_cpus", + "once_cell", +] [[package]] name = "gst-plugin-fallbackswitch" -version = "0.10.7" -dependencies = [ "gio", "gst-plugin-gtk4", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "gstreamer-video", "gtk4", "once_cell", "parking_lot",] +version = "0.10.11" +dependencies = [ + "gio", + "gst-plugin-gtk4", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "gstreamer-video", + "gtk4", + "once_cell", + "parking_lot", +] [[package]] name = "gst-plugin-ffv1" -version = "0.10.7" -dependencies = [ "byte-slice-cast", "ffv1", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "once_cell",] +version = "0.10.11" +dependencies = [ + "byte-slice-cast", + "ffv1", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "gstreamer-video", + "once_cell", +] [[package]] name = "gst-plugin-file" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "once_cell", "url",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "once_cell", + "url", +] [[package]] name = "gst-plugin-flavors" -version = "0.10.7" -dependencies = [ "byteorder", "flavors", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "muldiv", "nom", "num-rational", "once_cell", "smallvec",] +version = "0.10.11" +dependencies = [ + "byteorder", + "flavors", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "muldiv", + "nom", + "num-rational", + "once_cell", + "smallvec", +] [[package]] name = "gst-plugin-fmp4" -version = "0.10.7" -dependencies = [ "anyhow", "chrono", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "gstreamer-pbutils", "gstreamer-video", "m3u8-rs", "once_cell",] +version = "0.10.11" +dependencies = [ + "anyhow", + "chrono", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "gstreamer-pbutils", + "gstreamer-video", + "m3u8-rs", + "once_cell", +] [[package]] name = "gst-plugin-gif" -version = "0.10.7" -dependencies = [ "atomic_refcell", "gif", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "once_cell",] +version = "0.10.11" +dependencies = [ + "atomic_refcell", + "gif", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "gstreamer-video", + "once_cell", +] [[package]] name = "gst-plugin-gtk4" -version = "0.10.7" -dependencies = [ "gdk4-wayland", "gdk4-x11", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-gl", "gstreamer-gl-egl", "gstreamer-gl-wayland", "gstreamer-gl-x11", "gstreamer-video", "gtk4", "once_cell",] +version = "0.10.11" +dependencies = [ + "gdk4-wayland", + "gdk4-win32", + "gdk4-x11", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-gl-wayland", + "gstreamer-gl-x11", + "gstreamer-video", + "gtk4", + "once_cell", + "windows-sys", +] [[package]] name = "gst-plugin-hlssink3" -version = "0.10.7" -dependencies = [ "gio", "glib", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "m3u8-rs", "once_cell", "regex",] +version = "0.10.11" +dependencies = [ + "gio", + "glib", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "m3u8-rs", + "once_cell", + "regex", +] [[package]] name = "gst-plugin-hsv" -version = "0.10.7" -dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-check", "gstreamer-video", "num-traits", "once_cell",] +version = "0.10.11" +dependencies = [ + "byte-slice-cast", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-check", + "gstreamer-video", + "num-traits", + "once_cell", +] [[package]] name = "gst-plugin-json" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "once_cell", "serde", "serde_json",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "once_cell", + "serde", + "serde_json", +] [[package]] name = "gst-plugin-lewton" -version = "0.10.7" -dependencies = [ "atomic_refcell", "byte-slice-cast", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-check", "lewton", "once_cell",] +version = "0.10.11" +dependencies = [ + "atomic_refcell", + "byte-slice-cast", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-check", + "lewton", + "once_cell", +] [[package]] name = "gst-plugin-livesync" -version = "0.10.7" -dependencies = [ "gio", "gst-plugin-gtk4", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-check", "gtk4", "muldiv", "num-rational", "once_cell", "parking_lot",] +version = "0.10.11" +dependencies = [ + "gio", + "gst-plugin-gtk4", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-check", + "gtk4", + "muldiv", + "num-rational", + "once_cell", + "parking_lot", +] [[package]] name = "gst-plugin-mp4" -version = "0.10.7" -dependencies = [ "anyhow", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-pbutils", "gstreamer-video", "once_cell", "tempfile", "url",] +version = "0.10.11" +dependencies = [ + "anyhow", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-pbutils", + "gstreamer-video", + "once_cell", + "tempfile", + "url", +] [[package]] name = "gst-plugin-ndi" -version = "0.10.7" -dependencies = [ "atomic_refcell", "byte-slice-cast", "byteorder", "glib", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-video", "libloading", "once_cell",] +version = "0.10.11" +dependencies = [ + "atomic_refcell", + "byte-slice-cast", + "byteorder", + "glib", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-video", + "libloading", + "once_cell", +] [[package]] name = "gst-plugin-onvif" -version = "0.10.7" -dependencies = [ "cairo-rs", "chrono", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-rtp", "gstreamer-video", "once_cell", "pango", "pangocairo", "xmlparser", "xmltree",] +version = "0.10.11" +dependencies = [ + "cairo-rs", + "chrono", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-rtp", + "gstreamer-video", + "once_cell", + "pango", + "pangocairo", + "xmlparser", + "xmltree", +] [[package]] name = "gst-plugin-png" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "once_cell", "parking_lot", "png",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "gstreamer-video", + "once_cell", + "parking_lot", + "png", +] [[package]] name = "gst-plugin-raptorq" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-check", "gstreamer-rtp", "once_cell", "rand", "raptorq",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-check", + "gstreamer-rtp", + "once_cell", + "rand", + "raptorq", +] [[package]] name = "gst-plugin-rav1e" -version = "0.10.7" -dependencies = [ "atomic_refcell", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "once_cell", "rav1e",] +version = "0.10.11" +dependencies = [ + "atomic_refcell", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "gstreamer-video", + "once_cell", + "rav1e", +] [[package]] name = "gst-plugin-regex" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "once_cell", "regex",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "once_cell", + "regex", +] [[package]] name = "gst-plugin-reqwest" -version = "0.10.7" -dependencies = [ "futures", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "headers", "hyper", "mime", "once_cell", "reqwest", "tokio", "url",] +version = "0.10.11" +dependencies = [ + "futures", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "headers", + "hyper", + "mime", + "once_cell", + "reqwest", + "tokio", + "url", +] [[package]] name = "gst-plugin-rtp" -version = "0.10.7" -dependencies = [ "bitstream-io", "chrono", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-rtp", "once_cell",] +version = "0.10.11" +dependencies = [ + "bitstream-io", + "chrono", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "gstreamer-rtp", + "once_cell", +] [[package]] name = "gst-plugin-sodium" -version = "0.10.7" -dependencies = [ "clap", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "gstreamer-base", "gstreamer-check", "hex", "once_cell", "pretty_assertions", "rand", "serde", "serde_json", "smallvec", "sodiumoxide",] +version = "0.10.11" +dependencies = [ + "clap", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-base", + "gstreamer-check", + "hex", + "once_cell", + "pretty_assertions", + "rand", + "serde", + "serde_json", + "smallvec", + "sodiumoxide", +] [[package]] name = "gst-plugin-spotify" -version = "0.10.7" -dependencies = [ "anyhow", "futures", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "librespot", "once_cell", "tokio", "url",] +version = "0.10.11" +dependencies = [ + "anyhow", + "futures", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "librespot", + "once_cell", + "tokio", + "url", +] [[package]] name = "gst-plugin-textahead" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "once_cell",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "once_cell", +] [[package]] name = "gst-plugin-textwrap" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "hyphenation", "once_cell", "textwrap",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "hyphenation", + "once_cell", + "textwrap", +] [[package]] name = "gst-plugin-threadshare" -version = "0.10.7" -dependencies = [ "async-task", "cc", "clap", "concurrent-queue", "flume", "futures", "gio", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "gstreamer-audio", "gstreamer-check", "gstreamer-net", "gstreamer-rtp", "libc", "once_cell", "pin-project-lite", "pkg-config", "polling", "rand", "slab", "socket2 0.5.2", "waker-fn", "winapi",] +version = "0.10.11" +dependencies = [ + "async-task", + "cc", + "clap", + "concurrent-queue", + "flume", + "futures", + "gio", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-check", + "gstreamer-net", + "gstreamer-rtp", + "libc", + "once_cell", + "pin-project-lite", + "pkg-config", + "polling", + "rand", + "slab", + "socket2 0.5.3", + "waker-fn", + "winapi", +] [[package]] name = "gst-plugin-togglerecord" -version = "0.10.7" -dependencies = [ "either", "gio", "gst-plugin-gtk4", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-video", "gtk4", "once_cell", "parking_lot",] +version = "0.10.11" +dependencies = [ + "either", + "gio", + "gst-plugin-gtk4", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-video", + "gtk4", + "once_cell", + "parking_lot", +] [[package]] name = "gst-plugin-tracers" -version = "0.10.7" -dependencies = [ "anyhow", "gst-plugin-version-helper", "gstreamer", "once_cell", "regex", "signal-hook",] +version = "0.10.11" +dependencies = [ + "anyhow", + "gst-plugin-version-helper", + "gstreamer", + "once_cell", + "regex", + "signal-hook", +] [[package]] name = "gst-plugin-tutorial" -version = "0.10.7" -dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", "gstreamer-base", "gstreamer-video", "num-traits", "once_cell",] +version = "0.10.11" +dependencies = [ + "byte-slice-cast", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-video", + "num-traits", + "once_cell", +] [[package]] name = "gst-plugin-uriplaylistbin" -version = "0.10.7" -dependencies = [ "anyhow", "clap", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", "more-asserts", "once_cell", "url",] +version = "0.10.11" +dependencies = [ + "anyhow", + "clap", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "more-asserts", + "once_cell", + "thiserror", + "url", +] [[package]] name = "gst-plugin-version-helper" version = "0.7.5" -dependencies = [ "chrono",] +dependencies = [ + "chrono", +] [[package]] name = "gst-plugin-videofx" -version = "0.10.7" -dependencies = [ "atomic_refcell", "cairo-rs", "color-name", "color-thief", "dssim-core", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-check", "gstreamer-video", "image", "image_hasher", "once_cell", "rgb",] +version = "0.10.11" +dependencies = [ + "atomic_refcell", + "cairo-rs", + "color-name", + "color-thief", + "dssim-core", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-check", + "gstreamer-video", + "image", + "image_hasher", + "once_cell", + "rgb", +] [[package]] name = "gst-plugin-webp" -version = "0.10.7" -dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "libwebp-sys2", "once_cell", "pretty_assertions",] +version = "0.10.11" +dependencies = [ + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-check", + "gstreamer-video", + "libwebp-sys2", + "once_cell", + "pretty_assertions", +] [[package]] name = "gst-plugin-webrtc" -version = "0.10.7" -dependencies = [ "anyhow", "async-tungstenite", "clap", "fastrand", "futures", "gst-plugin-version-helper", "gst-plugin-webrtc-signalling-protocol", "gstreamer", "gstreamer-app", "gstreamer-base", "gstreamer-rtp", "gstreamer-sdp", "gstreamer-utils", "gstreamer-video", "gstreamer-webrtc", "human_bytes", "once_cell", "serde", "serde_json", "thiserror", "tokio", "tokio-native-tls", "tokio-stream", "tracing", "tracing-log", "tracing-subscriber", "url", "uuid",] +version = "0.10.11" +dependencies = [ + "anyhow", + "async-tungstenite", + "clap", + "fastrand 2.0.0", + "futures", + "gst-plugin-version-helper", + "gst-plugin-webrtc-signalling-protocol", + "gstreamer", + "gstreamer-app", + "gstreamer-base", + "gstreamer-rtp", + "gstreamer-sdp", + "gstreamer-utils", + "gstreamer-video", + "gstreamer-webrtc", + "human_bytes", + "once_cell", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-native-tls", + "tokio-stream", + "tracing", + "tracing-log", + "tracing-subscriber", + "url", + "uuid", +] [[package]] name = "gst-plugin-webrtc-signalling" -version = "0.10.7" -dependencies = [ "anyhow", "async-tungstenite", "clap", "futures", "gst-plugin-webrtc-signalling-protocol", "once_cell", "pin-project-lite", "serde", "serde_json", "test-log", "thiserror", "tokio", "tokio-native-tls", "tracing", "tracing-log", "tracing-subscriber", "uuid",] +version = "0.10.11" +dependencies = [ + "anyhow", + "async-tungstenite", + "clap", + "futures", + "gst-plugin-webrtc-signalling-protocol", + "once_cell", + "pin-project-lite", + "serde", + "serde_json", + "test-log", + "thiserror", + "tokio", + "tokio-native-tls", + "tracing", + "tracing-log", + "tracing-subscriber", + "uuid", +] [[package]] name = "gst-plugin-webrtc-signalling-protocol" -version = "0.10.7" -dependencies = [ "serde", "serde_json",] +version = "0.10.11" +dependencies = [ + "serde", + "serde_json", +] [[package]] name = "gst-plugin-webrtchttp" -version = "0.10.7" -dependencies = [ "async-recursion", "bytes", "futures", "gst-plugin-version-helper", "gstreamer", "gstreamer-sdp", "gstreamer-webrtc", "once_cell", "parse_link_header", "reqwest", "tokio",] +version = "0.10.11" +dependencies = [ + "async-recursion", + "bytes", + "futures", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-sdp", + "gstreamer-webrtc", + "once_cell", + "parse_link_header", + "reqwest", + "tokio", +] [[package]] name = "gstreamer" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "cfg-if", "futures-channel", "futures-core", "futures-util", "glib", "gstreamer-sys", "libc", "muldiv", "num-integer", "num-rational", "once_cell", "option-operations", "paste", "pretty-hex", "serde", "serde_bytes", "smallvec", "thiserror",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pretty-hex", + "serde", + "serde_bytes", + "smallvec", + "thiserror", +] [[package]] name = "gstreamer-app" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "futures-core", "futures-sink", "glib", "gstreamer", "gstreamer-app-sys", "gstreamer-base", "libc", "once_cell",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "futures-core", + "futures-sink", + "glib", + "gstreamer", + "gstreamer-app-sys", + "gstreamer-base", + "libc", + "once_cell", +] [[package]] name = "gstreamer-app-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-audio" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "cfg-if", "glib", "gstreamer", "gstreamer-audio-sys", "gstreamer-base", "libc", "once_cell",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "glib", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", + "once_cell", +] [[package]] name = "gstreamer-audio-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-base" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "atomic_refcell", "bitflags", "cfg-if", "glib", "gstreamer", "gstreamer-base-sys", "libc",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "atomic_refcell", + "bitflags 1.3.2", + "cfg-if", + "glib", + "gstreamer", + "gstreamer-base-sys", + "libc", + "once_cell", +] [[package]] name = "gstreamer-base-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-check" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "glib", "gstreamer", "gstreamer-check-sys",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "glib", + "gstreamer", + "gstreamer-check-sys", +] [[package]] name = "gstreamer-check-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-gl" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "glib", "gstreamer", "gstreamer-base", "gstreamer-gl-sys", "gstreamer-video", "libc", "once_cell",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-gl-sys", + "gstreamer-video", + "libc", + "once_cell", +] [[package]] name = "gstreamer-gl-egl" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib", "gstreamer", "gstreamer-gl", "gstreamer-gl-egl-sys", "libc",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl-sys", + "libc", +] [[package]] name = "gstreamer-gl-egl-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-gl-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-gl-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-gl-wayland" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib", "gstreamer", "gstreamer-gl", "gstreamer-gl-wayland-sys", "libc",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-wayland-sys", + "libc", +] [[package]] name = "gstreamer-gl-wayland-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-gl-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-gl-x11" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib", "gstreamer", "gstreamer-gl", "gstreamer-gl-x11-sys", "libc",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-x11-sys", + "libc", +] [[package]] name = "gstreamer-gl-x11-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-gl-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-net" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "gio", "glib", "gstreamer", "gstreamer-net-sys",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "gio", + "glib", + "gstreamer", + "gstreamer-net-sys", +] [[package]] name = "gstreamer-net-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "gio-sys", "glib-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "gio-sys", + "glib-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-pbutils" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "glib", "gstreamer", "gstreamer-audio", "gstreamer-pbutils-sys", "gstreamer-video", "libc", "thiserror",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "glib", + "gstreamer", + "gstreamer-audio", + "gstreamer-pbutils-sys", + "gstreamer-video", + "libc", + "thiserror", +] [[package]] name = "gstreamer-pbutils-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "gstreamer-audio-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-audio-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-rtp" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "glib", "gstreamer", "gstreamer-rtp-sys", "libc", "once_cell",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "glib", + "gstreamer", + "gstreamer-rtp-sys", + "libc", + "once_cell", +] [[package]] name = "gstreamer-rtp-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-sdp" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib", "gstreamer", "gstreamer-sdp-sys",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp-sys", +] [[package]] name = "gstreamer-sdp-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-utils" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "gstreamer", "gstreamer-app", "gstreamer-video", "once_cell", "thiserror",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "gstreamer", + "gstreamer-app", + "gstreamer-video", + "once_cell", + "thiserror", +] [[package]] name = "gstreamer-video" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "bitflags", "cfg-if", "futures-channel", "glib", "gstreamer", "gstreamer-base", "gstreamer-video-sys", "libc", "once_cell", "serde",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "futures-channel", + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-video-sys", + "libc", + "once_cell", + "serde", +] [[package]] name = "gstreamer-video-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gstreamer-webrtc" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib", "gstreamer", "gstreamer-sdp", "gstreamer-webrtc-sys", "libc",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp", + "gstreamer-webrtc-sys", + "libc", +] [[package]] name = "gstreamer-webrtc-sys" -version = "0.20.5" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#50ec1922855441994c1cbe3e85a584cd91e72ddd" -dependencies = [ "glib-sys", "gstreamer-sdp-sys", "gstreamer-sys", "libc", "system-deps",] +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +dependencies = [ + "glib-sys", + "gstreamer-sdp-sys", + "gstreamer-sys", + "libc", + "system-deps", +] [[package]] name = "gtk4" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "bitflags", "cairo-rs", "field-offset", "futures-channel", "gdk-pixbuf", "gdk4", "gio", "glib", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", "once_cell", "pango",] +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "once_cell", + "pango", +] [[package]] name = "gtk4-macros" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", "syn 1.0.109",] +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "gtk4-sys" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" -dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", "gio-sys", "glib-sys", "gobject-sys", "graphene-sys", "gsk4-sys", "libc", "pango-sys", "system-deps",] +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] [[package]] name = "h2" -version = "0.3.18" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" -dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", "http", "indexmap", "slab", "tokio", "tokio-util", "tracing",] +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] [[package]] -name = "half" -version = "2.2.1" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ "crunchy",] +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ "ahash",] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "headers" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" -dependencies = [ "base64 0.13.1", "bitflags", "bytes", "headers-core", "http", "httpdate", "mime", "sha1",] +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] [[package]] name = "headers-core" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ "http",] +dependencies = [ + "http", +] [[package]] name = "heck" @@ -1648,20 +3133,15 @@ name = "hermit-abi" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ "libc",] +dependencies = [ + "libc", +] [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ "libc",] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1674,42 +3154,63 @@ name = "hmac" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ "crypto-mac", "digest 0.9.0",] +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ "digest 0.10.6",] +dependencies = [ + "digest 0.10.7", +] [[package]] name = "hostname" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ "libc", "match_cfg", "winapi",] +dependencies = [ + "libc", + "match_cfg", + "winapi", +] [[package]] name = "hrtf" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73088c4a5d7c9d21ee942a54611696f247c4bafc85e9261bf8c409b6857e75be" -dependencies = [ "byteorder", "rubato", "rustfft",] +dependencies = [ + "byteorder", + "rubato", + "rustfft", +] [[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ "bytes", "fnv", "itoa",] +dependencies = [ + "bytes", + "fnv", + "itoa", +] [[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ "bytes", "http", "pin-project-lite",] +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] [[package]] name = "httparse" @@ -1737,94 +3238,183 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" -dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", "socket2 0.4.9", "tokio", "tower-service", "tracing", "want",] +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] [[package]] name = "hyper-proxy" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" -dependencies = [ "bytes", "futures", "headers", "http", "hyper", "tokio", "tower-service",] +dependencies = [ + "bytes", + "futures", + "headers", + "http", + "hyper", + "tokio", + "tower-service", +] [[package]] name = "hyper-rustls" version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ "http", "hyper", "log", "rustls", "rustls-native-certs", "tokio", "tokio-rustls",] +dependencies = [ + "http", + "hyper", + "log", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", +] [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ "bytes", "hyper", "native-tls", "tokio", "tokio-native-tls",] +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] [[package]] name = "hyphenation" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcf4dd4c44ae85155502a52c48739c8a48185d1449fff1963cffee63c28a50f0" -dependencies = [ "bincode", "fst", "hyphenation_commons", "pocket-resources", "serde",] +dependencies = [ + "bincode", + "fst", + "hyphenation_commons", + "pocket-resources", + "serde", +] [[package]] name = "hyphenation_commons" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5febe7a2ade5c7d98eb8b75f946c046b335324b06a14ea0998271504134c05bf" -dependencies = [ "fst", "serde",] +dependencies = [ + "fst", + "serde", +] [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" -dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", "windows",] +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ "cxx", "cxx-build",] +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] [[package]] name = "idna" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ "matches", "unicode-bidi", "unicode-normalization",] +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] [[package]] name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ "unicode-bidi", "unicode-normalization",] +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] [[package]] name = "if-addrs" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" -dependencies = [ "libc", "winapi",] +dependencies = [ + "libc", + "winapi", +] [[package]] name = "image" version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", "qoi", "tiff",] +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] [[package]] name = "image_hasher" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a465709ca502270eba7ae8129c6a680f5668748d7edafa85da0f8ceae596bb2b" -dependencies = [ "base64 0.13.1", "image", "rustdct", "serde", "transpose",] +checksum = "8f9e64a8c472ea9f81ac448e3b488fd82dcdfce6434cf880882bf36bfb5c268a" +dependencies = [ + "base64 0.21.2", + "image", + "rustdct", + "serde", + "transpose", +] [[package]] name = "imgref" @@ -1837,75 +3427,119 @@ name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ "autocfg", "hashbrown",] +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] [[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ "cfg-if",] +dependencies = [ + "cfg-if", +] [[package]] name = "interpolate_name" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b35f4a811037cfdcd44c5db40678464b2d5d248fc1abeeaaa125b370d47f17" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109",] +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ "hermit-abi 0.3.1", "libc", "windows-sys 0.48.0",] +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys", +] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", "windows-sys 0.48.0",] +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.2", + "rustix 0.38.4", + "windows-sys", +] [[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ "either",] +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ "libc",] +dependencies = [ + "libc", +] [[package]] -name = "jpeg-decoder" -version = "0.3.0" +name = "js-sys" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ "rayon",] +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] [[package]] -name = "js-sys" -version = "0.3.61" +name = "khronos-egl" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ "wasm-bindgen",] +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", +] [[package]] name = "lazy_static" @@ -1914,154 +3548,306 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] name = "lewton" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -dependencies = [ "byteorder", "ogg", "tinyvec",] +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libfuzzer-sys" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf184a4b6b274f82a5df6b357da6055d3e82272327bba281c28bbba6f1664ef" -dependencies = [ "arbitrary", "cc",] +dependencies = [ + "arbitrary", + "cc", +] [[package]] name = "libloading" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" -dependencies = [ "cfg-if", "windows-sys 0.48.0",] +dependencies = [ + "cfg-if", + "windows-sys", +] [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmdns" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b04ae6b56b3b19ade26f0e7e7c1360a1713514f326c5ed0797cf2c109c9e010" -dependencies = [ "byteorder", "futures-util", "hostname", "if-addrs", "log", "multimap", "nix", "rand", "socket2 0.4.9", "thiserror", "tokio", "winapi",] +dependencies = [ + "byteorder", + "futures-util", + "hostname", + "if-addrs", + "log", + "multimap", + "nix", + "rand", + "socket2 0.4.9", + "thiserror", + "tokio", + "winapi", +] [[package]] name = "librespot" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea4c9952ef48968f8184a4a87f8576982426ebe623342d5a28f7d9c4978e4a44" -dependencies = [ "base64 0.13.1", "env_logger 0.9.3", "futures-util", "getopts", "hex", "hyper", "librespot-audio", "librespot-connect", "librespot-core", "librespot-discovery", "librespot-metadata", "librespot-playback", "librespot-protocol", "log", "rpassword", "sha-1", "thiserror", "tokio", "url",] +dependencies = [ + "base64 0.13.1", + "env_logger 0.9.3", + "futures-util", + "getopts", + "hex", + "hyper", + "librespot-audio", + "librespot-connect", + "librespot-core", + "librespot-discovery", + "librespot-metadata", + "librespot-playback", + "librespot-protocol", + "log", + "rpassword", + "sha-1", + "thiserror", + "tokio", + "url", +] [[package]] name = "librespot-audio" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d" -dependencies = [ "aes-ctr", "byteorder", "bytes", "futures-util", "librespot-core", "log", "tempfile", "tokio",] +dependencies = [ + "aes-ctr", + "byteorder", + "bytes", + "futures-util", + "librespot-core", + "log", + "tempfile", + "tokio", +] [[package]] name = "librespot-connect" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ffafb6a443e9445ccb3d5d591573b5b1da3c89a9b8846c63ba2c3710210d3ec" -dependencies = [ "form_urlencoded", "futures-util", "librespot-core", "librespot-discovery", "librespot-playback", "librespot-protocol", "log", "protobuf", "rand", "serde", "serde_json", "tokio", "tokio-stream",] +dependencies = [ + "form_urlencoded", + "futures-util", + "librespot-core", + "librespot-discovery", + "librespot-playback", + "librespot-protocol", + "log", + "protobuf", + "rand", + "serde", + "serde_json", + "tokio", + "tokio-stream", +] [[package]] name = "librespot-core" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d" -dependencies = [ "aes", "base64 0.13.1", "byteorder", "bytes", "form_urlencoded", "futures-core", "futures-util", "hmac 0.11.0", "http", "httparse", "hyper", "hyper-proxy", "librespot-protocol", "log", "num-bigint", "num-integer", "num-traits", "once_cell", "pbkdf2", "priority-queue", "protobuf", "rand", "serde", "serde_json", "sha-1", "shannon", "thiserror", "tokio", "tokio-stream", "tokio-util", "url", "uuid", "vergen",] +dependencies = [ + "aes", + "base64 0.13.1", + "byteorder", + "bytes", + "form_urlencoded", + "futures-core", + "futures-util", + "hmac 0.11.0", + "http", + "httparse", + "hyper", + "hyper-proxy", + "librespot-protocol", + "log", + "num-bigint", + "num-integer", + "num-traits", + "once_cell", + "pbkdf2", + "priority-queue", + "protobuf", + "rand", + "serde", + "serde_json", + "sha-1", + "shannon", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "url", + "uuid", + "vergen", +] [[package]] name = "librespot-discovery" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aa877d18f6150364012cb4be5682d62d7c712c88bae2d0d01720fd7c15e2f06" -dependencies = [ "aes-ctr", "base64 0.13.1", "form_urlencoded", "futures-core", "hmac 0.11.0", "hyper", "libmdns", "librespot-core", "log", "rand", "serde_json", "sha-1", "thiserror", "tokio",] +dependencies = [ + "aes-ctr", + "base64 0.13.1", + "form_urlencoded", + "futures-core", + "hmac 0.11.0", + "hyper", + "libmdns", + "librespot-core", + "log", + "rand", + "serde_json", + "sha-1", + "thiserror", + "tokio", +] [[package]] name = "librespot-metadata" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c" -dependencies = [ "async-trait", "byteorder", "librespot-core", "librespot-protocol", "log", "protobuf",] +dependencies = [ + "async-trait", + "byteorder", + "librespot-core", + "librespot-protocol", + "log", + "protobuf", +] [[package]] name = "librespot-playback" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7" -dependencies = [ "byteorder", "futures-executor", "futures-util", "lewton", "librespot-audio", "librespot-core", "librespot-metadata", "log", "ogg", "parking_lot", "rand", "rand_distr", "shell-words", "thiserror", "tokio", "zerocopy",] +dependencies = [ + "byteorder", + "futures-executor", + "futures-util", + "lewton", + "librespot-audio", + "librespot-core", + "librespot-metadata", + "log", + "ogg", + "parking_lot", + "rand", + "rand_distr", + "shell-words", + "thiserror", + "tokio", + "zerocopy", +] [[package]] name = "librespot-protocol" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f" -dependencies = [ "glob", "protobuf", "protobuf-codegen-pure",] +dependencies = [ + "glob", + "protobuf", + "protobuf-codegen-pure", +] [[package]] name = "libsodium-sys" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" -dependencies = [ "cc", "libc", "pkg-config", "walkdir",] +dependencies = [ + "cc", + "libc", + "pkg-config", + "walkdir", +] [[package]] name = "libwebp-sys2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74f9c6964201c51319f16a796dc947a73961646eba49f584187b12de9970d077" -dependencies = [ "cc", "cfg-if", "libc", "pkg-config", "vcpkg",] +dependencies = [ + "cc", + "cfg-if", + "libc", + "pkg-config", + "vcpkg", +] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ "cc",] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ "autocfg", "scopeguard",] +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ "cfg-if",] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "m3u8-rs" version = "5.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d39af8845edca961e3286dcbafeb9e6407d3df6a616ef086847162d46f438d75" -dependencies = [ "chrono", "nom",] +dependencies = [ + "chrono", + "nom", +] [[package]] name = "match_cfg" @@ -2074,7 +3860,9 @@ name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ "regex-automata",] +dependencies = [ + "regex-automata 0.1.10", +] [[package]] name = "matches" @@ -2087,14 +3875,19 @@ name = "maybe-rayon" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ "cfg-if", "rayon",] +dependencies = [ + "cfg-if", + "rayon", +] [[package]] name = "md-5" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ "digest 0.10.6",] +dependencies = [ + "digest 0.10.7", +] [[package]] name = "memchr" @@ -2107,14 +3900,18 @@ name = "memoffset" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ "autocfg",] +dependencies = [ + "autocfg", +] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ "autocfg",] +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] [[package]] name = "mime" @@ -2130,24 +3927,24 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ "adler",] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ "adler", "simd-adler32",] +dependencies = [ + "adler", + "simd-adler32", +] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.45.0",] +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] [[package]] name = "more-asserts" @@ -2166,28 +3963,45 @@ name = "multimap" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -dependencies = [ "serde",] +dependencies = [ + "serde", +] [[package]] name = "nanorand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ "getrandom",] +dependencies = [ + "getrandom", +] [[package]] name = "nasm-rs" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe4d98d0065f4b1daf164b3eafb11974c94662e5e2396cf03f32d0bb5c17da51" -dependencies = [ "rayon",] +dependencies = [ + "rayon", +] [[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ "lazy_static", "libc", "log", "openssl", "openssl-probe", "openssl-sys", "schannel", "security-framework", "security-framework-sys", "tempfile",] +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] [[package]] name = "new_debug_unreachable" @@ -2200,21 +4014,33 @@ name = "nix" version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ "bitflags", "cc", "cfg-if", "libc", "memoffset 0.6.5",] +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] [[package]] name = "nnnoiseless" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d377ce2fb579ed5c14cfa0d39e70849030fdf673d6d1a764cadb2dfbb02a50" -dependencies = [ "once_cell", "rustfft",] +dependencies = [ + "once_cell", + "rustfft", +] [[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ "memchr", "minimal-lexical",] +dependencies = [ + "memchr", + "minimal-lexical", +] [[package]] name = "noop_proc_macro" @@ -2227,76 +4053,120 @@ name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ "overload", "winapi",] +dependencies = [ + "overload", + "winapi", +] [[package]] name = "num-bigint" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ "autocfg", "num-integer", "num-traits", "rand",] +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "rand", +] [[package]] name = "num-complex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ "num-traits",] +dependencies = [ + "num-traits", +] [[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109",] +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ "autocfg", "num-traits",] +dependencies = [ + "autocfg", + "num-traits", +] [[package]] name = "num-rational" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ "autocfg", "num-bigint", "num-integer", "num-traits", "serde",] +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", + "serde", +] [[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ "autocfg", "libm",] +dependencies = [ + "autocfg", + "libm", +] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ "hermit-abi 0.2.6", "libc",] +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.2", + "libc", +] [[package]] name = "object" -version = "0.30.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ "memchr",] +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] [[package]] name = "ogg" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -dependencies = [ "byteorder",] +dependencies = [ + "byteorder", +] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -2306,17 +4176,29 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" -dependencies = [ "bitflags", "cfg-if", "foreign-types", "libc", "once_cell", "openssl-macros", "openssl-sys",] +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] [[package]] name = "openssl-macros" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "openssl-probe" @@ -2326,24 +4208,24 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ "cc", "libc", "pkg-config", "vcpkg",] +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] [[package]] name = "option-operations" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" -dependencies = [ "paste",] - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ "winapi",] +dependencies = [ + "paste", +] [[package]] name = "outref" @@ -2359,94 +4241,148 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "bitflags", "gio", "glib", "libc", "once_cell", "pango-sys",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] [[package]] name = "pango-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] [[package]] name = "pangocairo" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "bitflags", "cairo-rs", "glib", "libc", "pango", "pangocairo-sys",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "glib", + "libc", + "pango", + "pangocairo-sys", +] [[package]] name = "pangocairo-sys" -version = "0.17.9" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#3ad562c758bf7b2452827c2e6d35e4effce23f71" -dependencies = [ "cairo-sys-rs", "glib-sys", "libc", "pango-sys", "system-deps",] +version = "0.17.10" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +dependencies = [ + "cairo-sys-rs", + "glib-sys", + "libc", + "pango-sys", + "system-deps", +] [[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ "lock_api", "parking_lot_core",] +dependencies = [ + "lock_api", + "parking_lot_core", +] [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ "backtrace", "cfg-if", "libc", "petgraph", "redox_syscall 0.2.16", "smallvec", "thread-id", "windows-sys 0.45.0",] +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "backtrace", + "cfg-if", + "libc", + "petgraph", + "redox_syscall 0.3.5", + "smallvec", + "thread-id", + "windows-targets", +] [[package]] name = "parse_link_header" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3687fe9debbbf2a019f381a8bc6b42049b22647449b39af54b3013985c0cf6de" -dependencies = [ "http", "lazy_static", "regex", "url",] +dependencies = [ + "http", + "lazy_static", + "regex", + "url", +] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ "crypto-mac", "hmac 0.11.0",] +dependencies = [ + "crypto-mac", + "hmac 0.11.0", +] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ "fixedbitset", "indexmap",] +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ "pin-project-internal",] +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +dependencies = [ + "pin-project-internal", +] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109",] +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -2462,10 +4398,16 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ "bitflags", "crc32fast", "fdeflate", "flate2", "miniz_oxide 0.7.1",] +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] [[package]] name = "pocket-resources" @@ -2478,7 +4420,16 @@ name = "polling" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ "autocfg", "bitflags", "cfg-if", "concurrent-queue", "libc", "log", "pin-project-lite", "windows-sys 0.48.0",] +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] [[package]] name = "ppv-lite86" @@ -2494,52 +4445,75 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ "ctor", "diff", "output_vt100", "yansi",] +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] [[package]] name = "primal-check" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" -dependencies = [ "num-integer",] +dependencies = [ + "num-integer", +] [[package]] name = "priority-queue" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9c6be70d989d21a136eb86c2d83e4b328447fac4a88dace2143c179c86267" -dependencies = [ "autocfg", "indexmap",] +checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" +dependencies = [ + "autocfg", + "indexmap 1.9.3", +] [[package]] name = "proc-macro-crate" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ "once_cell", "toml_edit",] +dependencies = [ + "once_cell", + "toml_edit", +] [[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", "syn 1.0.109", "version_check",] +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] [[package]] name = "proc-macro-error-attr" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ "proc-macro2", "quote", "version_check",] +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ "unicode-ident",] +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] [[package]] name = "protobuf" @@ -2552,14 +4526,19 @@ name = "protobuf-codegen" version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" -dependencies = [ "protobuf",] +dependencies = [ + "protobuf", +] [[package]] name = "protobuf-codegen-pure" version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865" -dependencies = [ "protobuf", "protobuf-codegen",] +dependencies = [ + "protobuf", + "protobuf-codegen", +] [[package]] name = "psl-types" @@ -2572,49 +4551,59 @@ name = "publicsuffix" version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" -dependencies = [ "idna 0.3.0", "psl-types",] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ "bytemuck",] +dependencies = [ + "idna 0.3.0", + "psl-types", +] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ "proc-macro2",] +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] [[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ "libc", "rand_chacha", "rand_core",] +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] [[package]] name = "rand_chacha" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ "ppv-lite86", "rand_core",] +dependencies = [ + "ppv-lite86", + "rand_core", +] [[package]] name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ "getrandom",] +dependencies = [ + "getrandom", +] [[package]] name = "rand_distr" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ "num-traits", "rand",] +dependencies = [ + "num-traits", + "rand", +] [[package]] name = "raptorq" @@ -2624,59 +4613,121 @@ checksum = "655b020bbf5c89791160a30f0d4706d8ec7aa5718d6a198f6df19c400e4f4470" [[package]] name = "rav1e" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1958c98fa048e4a52218524b3688474943507e25caf29d333ad85aa8a43575de" -dependencies = [ "arbitrary", "arg_enum_proc_macro", "arrayvec", "av1-grain", "bitstream-io", "built", "cc", "cfg-if", "interpolate_name", "itertools", "libc", "libfuzzer-sys", "log", "maybe-rayon", "nasm-rs", "new_debug_unreachable", "noop_proc_macro", "num-derive", "num-traits", "once_cell", "paste", "rand", "rand_chacha", "rust_hawktracer", "rustc_version", "simd_helpers", "system-deps", "thiserror", "v_frame",] +checksum = "16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cc", + "cfg-if", + "interpolate_name", + "itertools 0.10.5", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "nasm-rs", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive 0.3.3", + "num-traits", + "once_cell", + "paste", + "rand", + "rand_chacha", + "rust_hawktracer", + "rustc_version", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", +] [[package]] name = "rayon" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ "either", "rayon-core",] +dependencies = [ + "either", + "rayon-core", +] [[package]] name = "rayon-core" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", "num_cpus",] +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "realfft" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7695c87f31dc3644760f23fb59a3fed47659703abf76cf2d111f03b9e712342" -dependencies = [ "rustfft",] +dependencies = [ + "rustfft", +] [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ "bitflags",] +dependencies = [ + "bitflags 1.3.2", +] [[package]] name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ "bitflags",] +dependencies = [ + "bitflags 1.3.2", +] [[package]] name = "regex" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ "aho-corasick", "memchr", "regex-syntax 0.7.1",] +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] [[package]] name = "regex-automata" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ "regex-syntax 0.6.29",] +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] [[package]] name = "regex-syntax" @@ -2686,51 +4737,109 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" -dependencies = [ "async-compression", "base64 0.21.0", "bytes", "cookie", "cookie_store", "encoding_rs", "futures-core", "futures-util", "h2", "http", "http-body", "hyper", "hyper-tls", "ipnet", "js-sys", "log", "mime", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "winreg",] +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "async-compression", + "base64 0.21.2", + "bytes", + "cookie", + "cookie_store", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] [[package]] name = "rgb" version = "0.8.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" -dependencies = [ "bytemuck",] +dependencies = [ + "bytemuck", +] [[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ "cc", "libc", "once_cell", "spin 0.5.2", "untrusted", "web-sys", "winapi",] +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] [[package]] name = "rpassword" version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" -dependencies = [ "libc", "serde", "serde_json", "winapi",] +dependencies = [ + "libc", + "serde", + "serde_json", + "winapi", +] [[package]] name = "rubato" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610bbefcfef7f43cbe275995b6077b74f34480efce293c30327bf44fdad871ed" -dependencies = [ "log", "num-complex", "num-integer", "num-traits", "realfft",] +dependencies = [ + "log", + "num-complex", + "num-integer", + "num-traits", + "realfft", +] [[package]] name = "rust_hawktracer" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3480a29b927f66c6e06527be7f49ef4d291a01d694ec1fe85b0de71d6b02ac1" -dependencies = [ "rust_hawktracer_normal_macro", "rust_hawktracer_proc_macro",] +dependencies = [ + "rust_hawktracer_normal_macro", + "rust_hawktracer_proc_macro", +] [[package]] name = "rust_hawktracer_normal_macro" @@ -2755,186 +4864,279 @@ name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ "semver",] +dependencies = [ + "semver", +] [[package]] name = "rustdct" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b61555105d6a9bf98797c063c362a1d24ed8ab0431655e38f1cf51e52089551" -dependencies = [ "rustfft",] +dependencies = [ + "rustfft", +] [[package]] name = "rustfft" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" -dependencies = [ "num-complex", "num-integer", "num-traits", "primal-check", "strength_reduce", "transpose", "version_check",] +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0",] +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] [[package]] name = "rustls" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ "log", "ring", "sct", "webpki",] +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ "openssl-probe", "rustls-pemfile", "schannel", "security-framework",] +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ "base64 0.21.0",] +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ "winapi-util",] +dependencies = [ + "winapi-util", +] [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ "windows-sys 0.42.0",] +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ "ring", "untrusted",] +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ "bitflags", "core-foundation", "core-foundation-sys", "libc", "security-framework-sys",] +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ "core-foundation-sys", "libc",] +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ "serde",] +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.162" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" -dependencies = [ "serde_derive",] +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" -dependencies = [ "serde",] +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] [[package]] name = "serde_derive" -version = "1.0.162" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ "itoa", "ryu", "serde",] +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ "serde",] +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] [[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ "form_urlencoded", "itoa", "ryu", "serde",] +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] [[package]] name = "sha-1" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ "block-buffer 0.9.0", "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug",] +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] [[package]] name = "sha1" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.6",] +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.6",] +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] [[package]] name = "shannon" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561" -dependencies = [ "byteorder",] +dependencies = [ + "byteorder", +] [[package]] name = "sharded-slab" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ "lazy_static",] +dependencies = [ + "lazy_static", +] [[package]] name = "shell-words" @@ -2944,17 +5146,22 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ "libc", "signal-hook-registry",] +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] [[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ "libc",] +dependencies = [ + "libc", +] [[package]] name = "signature" @@ -2973,20 +5180,24 @@ name = "simd_helpers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ "quote",] +dependencies = [ + "quote", +] [[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ "autocfg",] +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smawk" @@ -2999,21 +5210,32 @@ name = "socket2" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ "libc", "winapi",] +dependencies = [ + "libc", + "winapi", +] [[package]] name = "socket2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d283f86695ae989d1e18440a943880967156325ba025f05049946bff47bcc2b" -dependencies = [ "libc", "windows-sys 0.48.0",] +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] [[package]] name = "sodiumoxide" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" -dependencies = [ "ed25519", "libc", "libsodium-sys", "serde",] +dependencies = [ + "ed25519", + "libc", + "libsodium-sys", + "serde", +] [[package]] name = "spin" @@ -3026,7 +5248,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ "lock_api",] +dependencies = [ + "lock_api", +] [[package]] name = "strength_reduce" @@ -3051,111 +5275,164 @@ name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ "proc-macro2", "quote", "unicode-ident",] +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ "proc-macro2", "quote", "unicode-ident",] +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "system-deps" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" -dependencies = [ "cfg-expr", "heck", "pkg-config", "toml 0.7.3", "version-compare",] +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.7.6", + "version-compare", +] [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", "rustix", "windows-sys 0.45.0",] +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand 1.9.0", + "redox_syscall 0.3.5", + "rustix 0.37.23", + "windows-sys", +] [[package]] name = "termcolor" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ "winapi-util",] +dependencies = [ + "winapi-util", +] [[package]] name = "test-log" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109",] +checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "test-with" version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3e3e1275a1442b99772321d4a35e0622f7abc04f6af49bd801c7119645bc9e" -dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", "syn 2.0.15",] +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.26", +] [[package]] name = "textwrap" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ "hyphenation", "smawk", "unicode-linebreak", "unicode-width",] +dependencies = [ + "hyphenation", + "smawk", + "unicode-linebreak", + "unicode-width", +] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ "thiserror-impl",] +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +dependencies = [ + "thiserror-impl", +] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "thread-id" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" -dependencies = [ "libc", "redox_syscall 0.2.16", "winapi",] +checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +dependencies = [ + "libc", + "redox_syscall 0.2.16", + "winapi", +] [[package]] name = "thread_local" version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ "cfg-if", "once_cell",] - -[[package]] -name = "tiff" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -dependencies = [ "flate2", "jpeg-decoder", "weezl",] +dependencies = [ + "cfg-if", + "once_cell", +] [[package]] name = "time" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", "winapi",] +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] [[package]] name = "time" version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ "itoa", "serde", "time-core", "time-macros",] +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] [[package]] name = "time-core" @@ -3168,14 +5445,18 @@ name = "time-macros" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ "time-core",] +dependencies = [ + "time-core", +] [[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ "tinyvec_macros",] +dependencies = [ + "tinyvec_macros", +] [[package]] name = "tinyvec_macros" @@ -3185,80 +5466,139 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" -dependencies = [ "autocfg", "bytes", "libc", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.4.9", "tokio-macros", "windows-sys 0.48.0",] +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros", + "windows-sys", +] [[package]] name = "tokio-macros" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "tokio-native-tls" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ "native-tls", "tokio",] +dependencies = [ + "native-tls", + "tokio", +] [[package]] name = "tokio-rustls" version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ "rustls", "tokio", "webpki",] +dependencies = [ + "rustls", + "tokio", + "webpki", +] [[package]] name = "tokio-stream" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ "futures-core", "pin-project-lite", "tokio",] +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] [[package]] name = "tokio-util" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", "tracing",] +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] [[package]] name = "toml" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ "serde",] +dependencies = [ + "serde", +] [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ "serde", "serde_spanned", "toml_datetime", "toml_edit",] +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ "serde",] +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", "winnow",] +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] [[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ "futures-core", "futures-util", "pin-project", "pin-project-lite", "tokio", "tower-layer", "tower-service", "tracing",] +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] [[package]] name = "tower-layer" @@ -3277,42 +5617,73 @@ name = "tracing" version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ "cfg-if", "log", "pin-project-lite", "tracing-attributes", "tracing-core",] +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" -dependencies = [ "proc-macro2", "quote", "syn 2.0.15",] +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ "once_cell", "valuable",] +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] [[package]] name = "tracing-log" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ "lazy_static", "log", "tracing-core",] +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] [[package]] name = "tracing-subscriber" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ "matchers", "nu-ansi-term", "once_cell", "regex", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log",] +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] [[package]] name = "transpose" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" -dependencies = [ "num-integer", "strength_reduce",] +dependencies = [ + "num-integer", + "strength_reduce", +] [[package]] name = "try-lock" @@ -3325,7 +5696,20 @@ name = "tungstenite" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" -dependencies = [ "byteorder", "bytes", "data-encoding", "http", "httparse", "log", "native-tls", "rand", "sha1", "thiserror", "url", "utf-8",] +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "native-tls", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] [[package]] name = "typenum" @@ -3341,23 +5725,28 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-linebreak" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ "hashbrown", "regex",] +dependencies = [ + "hashbrown 0.12.3", + "regex", +] [[package]] name = "unicode-normalization" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ "tinyvec",] +dependencies = [ + "tinyvec", +] [[package]] name = "unicode-width" @@ -3373,10 +5762,14 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ "form_urlencoded", "idna 0.3.0", "percent-encoding",] +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", +] [[package]] name = "urlencoding" @@ -3398,17 +5791,25 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" -dependencies = [ "getrandom",] +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", +] [[package]] name = "v_frame" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148c23ce3c8dae5562911cba1c264eaa5e31e133e0d5d08455409de9dd540358" -dependencies = [ "cfg-if", "new_debug_unreachable", "noop_proc_macro", "num-derive", "num-traits", "rust_hawktracer",] +checksum = "bec8189c996a12ac77c50065f9c9f64961e56eb940d0ae1a4ccc7bea238bb4bc" +dependencies = [ + "cfg-if", + "noop_proc_macro", + "num-derive 0.4.0", + "num-traits", + "rust_hawktracer", +] [[package]] name = "va_list" @@ -3433,7 +5834,11 @@ name = "vergen" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" -dependencies = [ "bitflags", "chrono", "rustc_version",] +dependencies = [ + "bitflags 1.3.2", + "chrono", + "rustc_version", +] [[package]] name = "version-compare" @@ -3464,14 +5869,19 @@ name = "walkdir" version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ "same-file", "winapi-util",] +dependencies = [ + "same-file", + "winapi-util", +] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ "log", "try-lock",] +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] [[package]] name = "wasi" @@ -3487,58 +5897,89 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ "cfg-if", "wasm-bindgen-macro",] +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", "syn 1.0.109", "wasm-bindgen-shared",] +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-shared", +] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ "cfg-if", "js-sys", "wasm-bindgen", "web-sys",] +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ "quote", "wasm-bindgen-macro-support",] +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared",] +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ "js-sys", "wasm-bindgen",] +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] [[package]] name = "webpki" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ "ring", "untrusted",] +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "weezl" @@ -3551,7 +5992,10 @@ name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu",] +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] [[package]] name = "winapi-i686-pc-windows-gnu" @@ -3564,7 +6008,9 @@ name = "winapi-util" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ "winapi",] +dependencies = [ + "winapi", +] [[package]] name = "winapi-x86_64-pc-windows-gnu" @@ -3577,48 +6023,33 @@ name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ "windows-targets 0.48.0",] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2",] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ "windows-targets 0.42.2",] +dependencies = [ + "windows-targets", +] [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ "windows-targets 0.48.0",] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2",] +dependencies = [ + "windows-targets", +] [[package]] name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", "windows_i686_gnu 0.48.0", "windows_i686_msvc 0.48.0", "windows_x86_64_gnu 0.48.0", "windows_x86_64_gnullvm 0.48.0", "windows_x86_64_msvc 0.48.0",] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] [[package]] name = "windows_aarch64_gnullvm" @@ -3628,95 +6059,63 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ "memchr",] +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +dependencies = [ + "memchr", +] [[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ "winapi",] +dependencies = [ + "winapi", +] [[package]] name = "xml-rs" -version = "0.8.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f20f14e2bd1fef6ec891d50dbb37c7290a0568a6bbd9020bf62010d02b6f80e" +checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" [[package]] name = "xmlparser" @@ -3729,7 +6128,9 @@ name = "xmltree" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" -dependencies = [ "xml-rs",] +dependencies = [ + "xml-rs", +] [[package]] name = "yansi" @@ -3742,25 +6143,24 @@ name = "zerocopy" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" -dependencies = [ "byteorder", "zerocopy-derive",] +dependencies = [ + "byteorder", + "zerocopy-derive", +] [[package]] name = "zerocopy-derive" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" -dependencies = [ "proc-macro2", "quote", "syn 1.0.109",] +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ "simd-adler32",] - diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index 6f67ee6327ce..c16118926ce8 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , writeText , rustPlatform , meson @@ -31,9 +32,6 @@ # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null , hotdoc -# TODO: required for case-insensitivity hack below -, yq -, moreutils }: let @@ -98,6 +96,8 @@ let [ "csound" # tests have weird failure on x86, does not currently work on arm or darwin "livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357 + ] ++ lib.optionals stdenv.isAarch64 [ + "raptorq" # pointer alignment failure in tests on aarch64 ] ++ lib.optionals stdenv.isDarwin [ "reqwest" # tests hang on darwin "threadshare" # tests cannot bind to localhost on darwin @@ -112,13 +112,25 @@ let ) (lib.attrNames validPlugins); invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins; + + # TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138 + cargo-c' = (cargo-c.__spliced.buildHost or cargo-c).overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + name = "cargo-c-test-rlib-fix.patch"; + url = "https://github.com/lu-zero/cargo-c/commit/8421f2da07cd066d2ae8afbb027760f76dc9ee6c.diff"; + hash = "sha256-eZSR4DKSbS5HPpb9Kw8mM2ZWg7Y92gZQcaXUEu1WNj0="; + revert = true; + }) + ]; + }); in assert lib.assertMsg (invalidPlugins == []) "Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}"; stdenv.mkDerivation rec { pname = "gst-plugins-rs"; - version = "0.10.7"; + version = "0.10.11"; outputs = [ "out" "dev" ]; @@ -127,26 +139,37 @@ stdenv.mkDerivation rec { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = version; - hash = "sha256-b+j7nAMK66+msRnIaj1S1DSvES5Gid3QazXgqO1II/Q="; + hash = "sha256-oOoUGzbg/ib1pA0T81hxgLlHnTRlNCWH5qZUNAutn8U="; # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2 - nativeBuildInputs = [ yq moreutils ]; postFetch = '' - tomlq --toml-output '.package |= map(if .name == "color-name" - then (.source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a" | del(.checksum)) - else . - end)' $out/Cargo.lock | sponge $out/Cargo.lock + sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' + \[\[package\]\] + name = "color-name" + version = "\([^"\n]*\)" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "[^"\n]*" + EOF + )" + sedReplace="$(cat <<\EOF | sed -ze 's/\n/\\n/g' + [[package]] + name = "color-name" + version = "\1" + source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a" + EOF + )" + sed -i -ze "s|$sedSearch|$sedReplace|g" $out/Cargo.lock ''; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "cairo-rs-0.17.9" = "sha256-LiIb6y/Ks/o+rZhU8RpXN7jSo7JzBGmcNumxyx/lZs0="; + "cairo-rs-0.17.10" = "sha256-g7d1ccSbGIPVMu73mb5QvWVSN8XAB1xLZuWfgdd1cfU="; "color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A="; "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE="; "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk="; - "gdk4-0.6.6" = "sha256-TI4F9MjIpxFEZItoewP/Zem1vM4MsKNJTzfgah1vjmI="; - "gstreamer-0.20.5" = "sha256-IQ56Upe73egId1IJRfzvqrJIzTc1x5FgAEbva9kuqPE="; + "gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM="; + "gstreamer-0.20.7" = "sha256-o4o4mPFAZOshNNkCkykjG/b+UtT2z6TNLOEzJsfs+Mk="; }; }; @@ -161,7 +184,7 @@ stdenv.mkDerivation rec { pkg-config rustc cargo - cargo-c + cargo-c' nasm ] ++ lib.optionals enableDocumentation [ hotdoc diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 2fe745e0329e..6cafa2b6daeb 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-0Co536m9v5mj3S03jheUKzzkLf42+wwn4tCwFyL8Vh0="; + hash = "sha256-RmZhLXqZxg3NbwvbobenTSVioFAbKj4FdvCRa/HYgRs="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index c0926dfc5067..e4fa679d9d24 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-PcmO1cIpM2izxObOVdib6DSgpi6b+I7xeSjPA7fVo2A="; + hash = "sha256-/7Rh/abAbTFsS+VoJjLMiQFFTtcrEJix4CIbxV5nPNc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index c25aa55557aa..a8f4cb166cf3 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-onhnBi6LaTBfylt9PxPtfDGLcD59cnVslDlb0wXHsyw="; + hash = "sha256-lnuONT2C0AgaaNxTY5sl2ftMqJv6HgYUA+DNfSNYW6Y="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 92fc02bfa2c9..4fbf6f3a6e39 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -15,9 +14,9 @@ , vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.0"; + version = "0.8.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,25 +24,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; - rev = "v${version}"; - sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM="; }; - patches = [ - # https://github.com/wmww/gtk-layer-shell/pull/146 - # Mark wayland-scanner as a build-time dependency - (fetchpatch { - url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch"; - hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM="; - }) - # https://github.com/wmww/gtk-layer-shell/pull/147 - # Remove redundant dependency check for gtk-doc - (fetchpatch { - url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch"; - hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs="; - }) - ]; - strictDeps = true; depsBuildBuild = [ @@ -74,8 +58,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; + homepage = "https://github.com/wmww/gtk-layer-shell"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ eonpatapon ]; + maintainers = with maintainers; [ eonpatapon donovanglover ]; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 4a77afa176a6..539cfc37051b 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -1,45 +1,63 @@ -{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg -, gdk-pixbuf, gobject-introspection -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups -, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" -, AppKit, Cocoa -, fetchpatch, buildPackages +{ config +, lib +, stdenv +, fetchurl +, atk +, buildPackages +, cairo +, cups +, gdk-pixbuf +, gettext +, glib +, gobject-introspection +, libXcomposite +, libXcursor +, libXdamage +, libXi +, libXinerama +, libXrandr +, libXrender +, pango +, perl +, pkg-config +, substituteAll , testers +, AppKit +, Cocoa +, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" +, cupsSupport ? config.gtk2.cups or stdenv.isLinux +, xineramaSupport ? stdenv.isLinux }: let - gtkCleanImmodulesCache = substituteAll { src = ./hooks/clean-immodules-cache.sh; gtk_module_path = "gtk-2.0"; gtk_binary_version = "2.10.0"; }; - in - stdenv.mkDerivation (finalAttrs: { pname = "gtk+"; version = "2.24.33"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; + url = "mirror://gnome/sources/gtk+/2.24/gtk+-${finalAttrs.version}.tar.xz"; + hash = "sha256-rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - enableParallelBuilding = true; - setupHooks = [ ./hooks/drop-icon-theme-cache.sh gtkCleanImmodulesCache ]; - nativeBuildInputs = finalAttrs.setupHooks ++ [ - perl pkg-config gettext gobject-introspection + gettext + gobject-introspection + perl + pkg-config ]; patches = [ @@ -50,19 +68,31 @@ stdenv.mkDerivation (finalAttrs: { ./patches/2.0-darwin-x11.patch ]; - propagatedBuildInputs = with xorg; - [ glib cairo pango gdk-pixbuf atk ] - ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ - libXrandr libXrender libXcomposite libXi libXcursor - ] - ++ lib.optionals stdenv.isDarwin [ libXdamage ] - ++ lib.optional xineramaSupport libXinerama - ++ lib.optionals cupsSupport [ cups ] - ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ]; + propagatedBuildInputs = [ + atk + cairo + gdk-pixbuf + glib + pango + ] ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ + libXcomposite + libXcursor + libXi + libXrandr + libXrender + ] ++ lib.optional xineramaSupport libXinerama + ++ lib.optional cupsSupport cups + ++ lib.optionals stdenv.isDarwin [ + libXdamage + AppKit + Cocoa + ]; - preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' - MACOSX_DEPLOYMENT_TARGET=10.16 - '' else null; + preConfigure = + lib.optionalString (stdenv.isDarwin + && lib.versionAtLeast + stdenv.hostPlatform.darwinMinVersion "11") + "MACOSX_DEPLOYMENT_TARGET=10.16"; configureFlags = [ "--sysconfdir=/etc" @@ -77,6 +107,8 @@ stdenv.mkDerivation (finalAttrs: { "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource" ]; + enableParallelBuilding = true; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; @@ -98,11 +130,21 @@ stdenv.mkDerivation (finalAttrs: { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; - meta = with lib; { + meta = { + homepage = "https://www.gtk.org/"; description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = "https://www.gtk.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 raskin ]; + longDescription = '' + GTK is a highly usable, feature rich toolkit for creating graphical user + interfaces which boasts cross platform compatibility and an easy to use + API. GTK it is written in C, but has bindings to many other popular + programming languages such as C++, Python and C# among others. GTK is + licensed under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK without any license fees or royalties. + ''; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ lovek323 raskin ]; + platforms = lib.platforms.all; pkgConfigModules = [ "gdk-2.0" "gtk+-2.0" @@ -110,18 +152,5 @@ stdenv.mkDerivation (finalAttrs: { "gdk-x11-2.0" "gtk+-x11-2.0" ]; - platforms = platforms.all; - - longDescription = '' - GTK is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK without any license fees or - royalties. - ''; - changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; }) diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 33e4c4464102..a527faf5a8be 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.37"; + version = "3.24.38"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-Z0XwtMBTeUFR/Q8OJHSwd8zP9fg+ndG/PTn+n+X7f1c="; + sha256 = "sha256-zhHezwGLJb3YUFVEpPhyQoVOyIvgVNmt5fOiBETdjuc="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index be2c5d64843e..b7e8c13ccca6 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch2 , pkg-config , gettext , graphene @@ -65,7 +64,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.10.3"; + version = "4.10.4"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -77,26 +76,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "RUVEGteeN3624KcFAm3HpGiG5GobA020CRKQnagBzqk="; + sha256 = "dyVABILgaF4oJl4ibGKEf05zz8qem0FqxYOCB/U3eiQ="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch - - # Fix deleting in Nautilus (part of 4.10.4) - # https://gitlab.gnome.org/GNOME/nautilus/-/issues/2945 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/4f47683710bbb4b56c286c6ee6a5c394fcf2b755.patch"; - sha256 = "fU9SX8MH37ZN6Ffk/YhYmipTC7+uT9JXnWggArWNkqA="; - }) - # Fix border/artifact appearing in applications (part of 4.10.4) - # https://gitlab.gnome.org/GNOME/mutter/-/issues/2805 - # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6696 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/b686ce1cb62dba505120e0f1116c516662a06e30.patch"; - sha256 = "0zjY5s+T4CVe3WiowgWE58ruVvqBFUuY2juwBOzMRN4="; - }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix index 1627e66d278e..c43f69fd97b5 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { libxml2 ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + ]; + mesonFlags = [ "-Dgtk_doc=true" ]; diff --git a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix index 2b3cd2566b5b..da830a6366c9 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; + sha256 = "sha256-1sPQNYOET6UqvgAwQxhgB/DIQUX+OwD6slmVvtqb5Vo="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/32 - name = "gi-docgen-as-native-dep.patch"; - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/11d4a33cff1f5d8b8ad4b80c4506246a9e0dff8f.diff"; - hash = "sha256-+p4vzUG2v+7mxtQ5AUcEI7SW0cDX6XlzqlyegF+I1Go="; - }) - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/nixpkgs/pkgs/development/libraries/gupnp/default.nix index bebf109d2778..4bff529a5156 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -33,6 +34,13 @@ stdenv.mkDerivation rec { patches = [ # Bring .pc file in line with our patched pkg-config. ./0001-pkg-config-Declare-header-dependencies-as-public.patch + + # Fix build against libxml2 2.11 + # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; + hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; + }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix index 4d6546f0e5be..9ffc49e5588a 100644 --- a/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -1,22 +1,37 @@ -{ lib, stdenv, fetchurl, substituteAll, meson, ninja, pkg-config, gettext, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 -, glib, libusb1, vala, hwdata +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, meson +, ninja +, pkg-config +, gobject-introspection +, gi-docgen +, python3 +, glib +, libusb1 +, json-glib +, vala +, hwdata +, umockdev }: let - pythonEnv = python3.pythonForBuild.withPackages(ps: with ps; [ + pythonEnv = python3.pythonForBuild.withPackages (ps: with ps; [ setuptools ]); in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.10"; + version = "0.4.6"; outputs = [ "bin" "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "sha256-DrC5qw+LugxZYxyAnDe2Fu806zyOAAsLm3HPEeSTG9w="; + src = fetchFromGitHub { + owner = "hughsie"; + repo = "libgusb"; + rev = "refs/tags/${version}"; + hash = "sha256-CtB9+5dDs+l05NyIFkKJpS1x3zHSykhLW3HiIM0RUWY="; }; patches = [ @@ -26,21 +41,45 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ - meson ninja pkg-config gettext pythonEnv - gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 - gobject-introspection vala + meson + ninja + pkg-config + gobject-introspection + gi-docgen + vala ]; - buildInputs = [ glib ]; - propagatedBuildInputs = [ libusb1 ]; + # all required in gusb.pc + propagatedBuildInputs = [ + glib + libusb1 + json-glib + ]; mesonFlags = [ - "-Dusb_ids=${hwdata}/share/hwdata/usb.ids" + (lib.mesonBool "tests" doCheck) + (lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids") + ]; + + checkInputs = [ + umockdev ]; doCheck = false; # tests try to access USB + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + ls -la "$out/share/doc" + moveToOutput "share/doc" "$devdoc" + ''; + meta = with lib; { description = "GLib libusb wrapper"; homepage = "https://github.com/hughsie/libgusb"; diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 39c06d23fdb2..51526ebf32e1 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.4"; + version = "1.50.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0="; + url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; + hash = "sha256-uG8JtzMchkLs6/RqPNoGkvXrJghvEyMmpUg8Lr+GpMs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 8b5bb4c42466..eb90fbc27592 100644 --- a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.5.0"; + version = "22.7.0"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QHAkPZoLQG+UQ1YNdad+XYOywqLqIW1vBmcFkuf3pXU="; + hash = "sha256-Jc8qNONdlyzpCCgwhMdwG2D2CO9o0l4vH9sE+NjidE4="; }; nativeBuildInputs = [ @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + meta = with lib; { description = "Libraries module for the Greenbone Vulnerability Management Solution"; homepage = "https://github.com/greenbone/gvm-libs"; diff --git a/nixpkgs/pkgs/development/libraries/herqq/default.nix b/nixpkgs/pkgs/development/libraries/herqq/default.nix index 65eacd7fffe3..3e84432cd507 100644 --- a/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { outputs = [ "out" "dev" ]; - sourceRoot = "source/herqq"; + sourceRoot = "${src.name}/herqq"; src = fetchFromGitHub { owner = "ThomArmax"; repo = "HUPnP"; diff --git a/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix b/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix new file mode 100644 index 000000000000..ad07025cc35d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, icu +, libarchive +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hfst-ospell"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "hfst"; + repo = "hfst-ospell"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; + }; + + buildInputs = [ + icu + libarchive + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + # libxmlxx is listed as a dependency but Darwin build fails with it, + # might also be better in general since libxmlxx in Nixpkgs is 8 years old + # https://github.com/hfst/hfst-ospell/issues/48#issuecomment-546535653 + configureFlags = [ + "--without-libxmlpp" + "--without-tinyxml2" + ]; + + meta = with lib; { + homepage = "https://github.com/hfst/hfst-ospell/"; + description = "HFST spell checker library and command line tool "; + license = licenses.asl20; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/hfst/default.nix b/nixpkgs/pkgs/development/libraries/hfst/default.nix new file mode 100644 index 000000000000..41707bbd4986 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hfst/default.nix @@ -0,0 +1,53 @@ +{ lib +, autoreconfHook +, bison +, flex +, foma +, fetchFromGitHub +, gettext +, icu +, stdenv +, swig +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hfst"; + version = "3.16.0"; + + src = fetchFromGitHub { + owner = "hfst"; + repo = "hfst"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU="; + }; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + swig + ]; + + buildInputs = [ + foma + gettext + icu + zlib + ]; + + configureFlags = [ + "--enable-all-tools" + "--with-foma-upstream=true" + ]; + + meta = with lib; { + description = "FST language processing library"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/hipfort/default.nix b/nixpkgs/pkgs/development/libraries/hipfort/default.nix index e22d09fbee84..5c5f0f61e81c 100644 --- a/nixpkgs/pkgs/development/libraries/hipfort/default.nix +++ b/nixpkgs/pkgs/development/libraries/hipfort/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "5.4.3"; + version = "5.6.0"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-cXzNOvWIU388AU5hzLwmIGaX5DvzIJJCvgkP2BA4jao="; + hash = "sha256-x1pF9md7RIcobE/4UxHxOaURbljFZGOashW1KM0lmo0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/hnswlib/default.nix b/nixpkgs/pkgs/development/libraries/hnswlib/default.nix new file mode 100644 index 000000000000..c3a543972e06 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hnswlib/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +}: +let + python = python3.withPackages(ps: with ps; [ + numpy + ]); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "hnswlib"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "nmslib"; + repo = "hnswlib"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-XXz0NIQ5dCGwcX2HtbK5NFTalP0TjLO6ll6TmH3oflI="; + }; + + # this is a header-only library, so we don't need to build it + # we need `cmake` only to run tests + nativeBuildInputs = lib.optionals finalAttrs.doCheck [ + cmake + python + ]; + + # we only want to run buildPhase when we run tests + dontBuild = !finalAttrs.doCheck; + + installPhase = '' + runHook preInstall + + install -Dm644 $src/hnswlib/*.h -t $out/include/hnswlib + + runHook postInstall + ''; + + doCheck = true; + + preCheck = '' + pushd ../tests/cpp + ${python.interpreter} update_gen_data.py + popd + ''; + + checkPhase = '' + runHook preCheck + + ./test_updates + + runHook postCheck + ''; + + meta = with lib; { + description = "Header-only C++/python library for fast approximate nearest neighbors"; + homepage = "https://github.com/nmslib/hnswlib"; + changelog = "https://github.com/nmslib/hnswlib/releases/tag/${finalAttrs.src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix b/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix index ba58835ea5dd..421782fc8d3d 100644 --- a/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-tX8AvlR/Az8fFs4ylqFijw3hXiNRoEWffmYbTcaqO90="; + hash = "sha256-jVIYP0yA1oSsUMN4vtrkfawj9Q2MwNjSrwDBTvGErg8="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/hspell/dicts.nix b/nixpkgs/pkgs/development/libraries/hspell/dicts.nix index 06f80bf5cf22..e11cbbce3336 100644 --- a/nixpkgs/pkgs/development/libraries/hspell/dicts.nix +++ b/nixpkgs/pkgs/development/libraries/hspell/dicts.nix @@ -1,4 +1,4 @@ -{ stdenv, hspell }: +{ lib, stdenv, hspell }: let dict = variant: a: stdenv.mkDerivation ({ @@ -8,7 +8,7 @@ let meta = hspell.meta // { broken = true; description = "${variant} Hebrew dictionary"; - } // (if a ? meta then a.meta else {}); + } // (lib.optionalAttrs (a ? meta) a.meta); } // (removeAttrs a ["meta"])); in { diff --git a/nixpkgs/pkgs/development/libraries/httplib/default.nix b/nixpkgs/pkgs/development/libraries/httplib/default.nix index dca86affa633..388f329d6d13 100644 --- a/nixpkgs/pkgs/development/libraries/httplib/default.nix +++ b/nixpkgs/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.12.5"; + version = "0.13.1"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-9qCquF6DXpgtrfXVd/hc8n1Eu1nOxf/Lm+R13QI0N9Q="; + hash = "sha256-2vS8gdJrf7Iz6F5kyyWlr7zB1eBDjxdLesJcnkhg5eE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 7ca6efe43373..753c1922e759 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -914,4 +914,14 @@ rec { # the README doesn't specify versions of licenses :/ license = with lib.licenses; [ gpl2Plus lgpl2Plus mpl10 asl20 cc-by-sa-25 ]; }; + + # Portugese + pt_BR = pt-br; + pt-br = mkDictFromLibreOffice { + shortName = "pt-br"; + dictFileName = "pt_BR"; + shortDescription = "Brazillian Portugese (Brazil)"; + readmeFile = "README_pt_BR.txt"; + license = with lib.licenses; [ lgpl3 ]; + }; } diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index 028504bb6996..b0c632b69c03 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -2,17 +2,18 @@ , x11Support ? false , libX11 , cairo -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudaPackages }: stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-fMSTGiD+9Ffgkzrz83W+bq+ncD/eIeE3v7loWxQJWZ4="; + sha256 = "sha256-Cof99nf4sAtWfSKbYyC/ayXGk+2qQ+C4UmjZmdawYM8="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/icu/73.nix b/nixpkgs/pkgs/development/libraries/icu/73.nix index 1a5536c0ce84..dfbdf1403adc 100644 --- a/nixpkgs/pkgs/development/libraries/icu/73.nix +++ b/nixpkgs/pkgs/development/libraries/icu/73.nix @@ -1,4 +1,4 @@ import ./base.nix { - version = "73.1"; - sha256 = "sha256-pFdDHeFktKp+ygDtE00A37+Ip3xphqEK53dPwHa7jEU="; + version = "73.2"; + sha256 = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE="; } diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index 3ebba3c50d0f..c0e20ba7f594 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk="; + hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/imath/default.nix b/nixpkgs/pkgs/development/libraries/imath/default.nix index 675167aaf21b..17d5f57c76c1 100644 --- a/nixpkgs/pkgs/development/libraries/imath/default.nix +++ b/nixpkgs/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-8TkrRqQYnp9Ho8jT22EQCEBIjlRWYlOAZSNOnJ5zCM0="; + sha256 = "sha256-NcGiYz7jbxLyVd80lOIyN3zXcC4mHh+dcFEY4Kqw9BY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index 78c255821650..ba9a0610bde0 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.5"; + version = "1.89.7"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-Ha70CTSBpyF9S+/qG9lAhUlUT4vY0crOoi3vFsy65H8="; + sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 9f40598d14c9..7faeb324ad55 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake # for passthru.tests , intel-compute-runtime @@ -9,15 +10,24 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.5"; + version = "22.3.7"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-txh0HGtWc39bWesTfyUjG4n560w8iRLyiHec6JA7FJQ="; + sha256 = "sha256-/iwTPWRVTZk1dhZD2Grcnc76ItgXjf2VrFD+93h8YvM="; }; + patches = [ + # fix build on i686 + # https://github.com/intel/gmmlib/pull/104 + (fetchpatch { + url = "https://github.com/intel/gmmlib/commit/2526286f29d8ad3d3a5833bdc29e23e5f3300b34.patch"; + hash = "sha256-mChK6wprAt+bo39g6LTNy25kJeGoKabpXFq2gSDhaPw="; + }) + ]; + nativeBuildInputs = [ cmake ]; passthru.tests = { diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 4ed72f4acd11..cb014ed80bf9 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { patches = [ # fix platform detection (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/04ffb03f744780a55aba311c612d708b00584bb7/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + sha256 = "sha256-o/Pg0S53SYh3O7L+AwxOPl1Bx4TS6iKB8ql8GhhHI/o="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix b/nixpkgs/pkgs/development/libraries/intel-vaapi-driver/default.nix index 2a9f0cf74032..5622ad158f91 100644 --- a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-vaapi-driver/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 -, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext +, intel-gpu-tools, libdrm, libva , enableHybridCodec ? false, vaapi-intel-hybrid +, enableGui ? true, libX11, libGL, wayland, libXext }: stdenv.mkDerivation rec { @@ -22,13 +23,14 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--enable-x11" - "--enable-wayland" + (lib.enableFeature enableGui "x11") + (lib.enableFeature enableGui "wayland") ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] + buildInputs = [ intel-gpu-tools libdrm libva ] + ++ lib.optionals enableGui [ libX11 libXext libGL wayland ] ++ lib.optional enableHybridCodec vaapi-intel-hybrid; enableParallelBuilding = true; @@ -48,6 +50,6 @@ stdenv.mkDerivation rec { backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix index d2da17ddc29f..43db1ac56b09 100644 --- a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ip2location-c"; - version = "8.5.1"; + version = "8.6.1"; src = fetchFromGitHub { owner = "chrislim2888"; repo = "IP2Location-C-Library"; rev = version; - sha256 = "sha256-+Az1bAJ3HT9mIjO43FOcEqxX3oA3RcIY7VvxfaHtBX8="; + sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix index 17e5ed482196..7fce11d21a43 100644 --- a/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { ]; NIX_CFLAGS_COMPILE = [ + "-Wno-error" "-I${lib.getDev ipu6-camera-bin}/include/ia_imaging" "-I${lib.getDev ipu6-camera-bin}/include/ia_camera" ]; diff --git a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix index aca509b3b036..f5a4c46f5791 100644 --- a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix +++ b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "4.11.0"; + version = "4.15.0"; src = fetchurl { url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "sha256-QI95nfQTVGj6fKNetrBcQAS+pEPYHKWLibLkgkAagrs="; + sha256 = "sha256-uDtUudfdbrh3OAs+xG83CwXa8sv6ExxhLwNZjWVMDvg="; }; nativeBuildInputs = [ gettext python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix index deb895da7d9c..a2484ce83077 100644 --- a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.7.1"; + version = "2.7.2"; underscoreMajMin = lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-d0FruJXNnwme1gPHWcIXpD2LO0fL8CzZOn8H14Quo50="; + sha256 = "sha256-/7NZy+ZroxeTF7av22LNJ0dlMzvTAWfOMypLLYWXWBI="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index 45f030270152..ed1d4af35fbd 100644 --- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.26"; + version = "1.18.28"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-KvH6g2hIdhtuUUQOxii0ncOAgOmHG7NScB+4yDWAh88="; + sha256 = "sha256-t3TcT8pUMiXYtejBY360E8Q2Oy5hPpUiJ3b3kqjOwOA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 2637ababbdd7..73bbe1782b7f 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -1,21 +1,21 @@ -{ ffmpeg_5-full -, nv-codec-headers-11 +{ ffmpeg_6-full +, nv-codec-headers-12 , chromaprint , fetchFromGitHub , lib }: -(ffmpeg_5-full.override { - nv-codec-headers = nv-codec-headers-11; +(ffmpeg_6-full.override { + nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-8"; + version = "6.0-4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-0ne9Xj9MnB5WOkPRtPX7W30qG1osHd0tyua+5RMrnQc="; + sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix index c65a3af9c42a..edf46fa4f51b 100644 --- a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix +++ b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "3.3.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM="; + hash = "sha256-GSGlupTN1o8BbTN287beqYSRFDaXOk6SlIRvtjpvmhQ="; }; outputs = [ "out" "dev" ]; @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; # avoid warnings + # prevent jitterentropy from builtin strip to allow controlling this from the derivation's + # settings. Also fixes a strange issue, where this strip may fail when cross-compiling. installFlags = [ + "INSTALL_STRIP=install" "PREFIX=${placeholder "out"}" ]; diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 41e9a2d0a03a..59572afc627c 100644 --- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -40,19 +40,13 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" + "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}" ] # the test's won't compile if secureMemory is used because there is no # comparison operators and conversion functions between # std::basic_string<..., Json::SecureAllocator<char>> vs. # std::basic_string<..., [default allocator]> - ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF" - ++ lib.optional (!enableStatic) "-DBUILD_STATIC_LIBS=OFF"; - - # this is fixed and no longer necessary in 1.9.5 but there they use - # memset_s without switching to a different c++ standard in the cmake files - postInstall = lib.optionalString enableStatic '' - (cd $out/lib && ln -sf libjsoncpp_static.a libjsoncpp.a) - ''; + ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF"; meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix index 4b0ac0391936..3543fef66337 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,20 +1,45 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, - kidletime, kio, lmdb, qtbase, qtdeclarative, solid, +{ mkDerivation +, lib +, fetchpatch +, extra-cmake-modules +, kauth +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kfilemetadata +, ki18n +, kidletime +, kio +, lmdb +, qtbase +, qtdeclarative +, solid +, }: mkDerivation { pname = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative - solid - ]; + buildInputs = [ kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative solid ]; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; + # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups + # where the device id will change on reboot causing baloo to reindex all the files and then having + # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet. + # However, without this patch, people tend to disable baloo rather than dealing with the constant + # reindexing. + # + # https://bugs.kde.org/show_bug.cgi?id=402154 + patches = [ + (fetchpatch { + url = "https://bugsfiles.kde.org/attachment.cgi?id=159031"; + hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY="; + name = "use_fsid.patch"; + }) + ]; + # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index b1f804135545..8079db3164a5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.107/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.108/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index cf118beaabce..3d1e6bfb23d4 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -13,8 +13,8 @@ mkDerivation { buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications - kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2 + kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras qtquickcontrols2 ]; - propagatedBuildInputs = [ kpackage kservice qtbase ]; + propagatedBuildInputs = [ kpackage kservice qtbase kirigami2 ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 7d3d6dae2985..60015002daeb 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/attica-5.107.0.tar.xz"; - sha256 = "1y0kxrr0janlba0pris35kaf31y8xqjksj0f6vpmww63jz53rjzx"; - name = "attica-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/attica-5.108.0.tar.xz"; + sha256 = "15didd7llqamp9wbvrynnf9cap2dqmwr51mz0pcjdk0iqs6ym4qq"; + name = "attica-5.108.0.tar.xz"; }; }; baloo = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/baloo-5.107.0.tar.xz"; - sha256 = "0i3sfzx9hsypzpw28n913kcrvg4vy1sb8civx86jdggamxslwhz2"; - name = "baloo-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/baloo-5.108.0.tar.xz"; + sha256 = "1n65nhr45vl0banbdjxhjf6wk5ypdx06qygqzqjbd9xbv7djj883"; + name = "baloo-5.108.0.tar.xz"; }; }; bluez-qt = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/bluez-qt-5.107.0.tar.xz"; - sha256 = "0wffp7vsl9z6kdfgjga5kf7dj48nm5r5nd7whiw4s0g9h63b0aig"; - name = "bluez-qt-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/bluez-qt-5.108.0.tar.xz"; + sha256 = "1yf2rbqp9997318ybnd8myvj26pzdkx55j6w86ibvn7hwgb77hhs"; + name = "bluez-qt-5.108.0.tar.xz"; }; }; breeze-icons = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/breeze-icons-5.107.0.tar.xz"; - sha256 = "0fhhpy34s05gx8nk7izc9ahdacbcl6yrfcr9q7k6825sngpmzck7"; - name = "breeze-icons-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/breeze-icons-5.108.0.tar.xz"; + sha256 = "175g6352lv8gq6sn4pkl91b51njdliryb82x2wdjbvzlc3zhfrcy"; + name = "breeze-icons-5.108.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/extra-cmake-modules-5.107.0.tar.xz"; - sha256 = "1v9klrfi7m1228zysr1m6r5qrn8h6nkzgai6x40mjshydpasls9r"; - name = "extra-cmake-modules-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/extra-cmake-modules-5.108.0.tar.xz"; + sha256 = "0yj4xpzzz5q8140mqkl2s5zabfbks76a3rqfq3cc4d5x3b9an57z"; + name = "extra-cmake-modules-5.108.0.tar.xz"; }; }; frameworkintegration = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/frameworkintegration-5.107.0.tar.xz"; - sha256 = "0j5aa4j4v5dix8r80n49ihkp6f0mmgx420h4adq9sb80hsm1c67q"; - name = "frameworkintegration-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/frameworkintegration-5.108.0.tar.xz"; + sha256 = "09zba76xihqs2dpwm4gh7p36nj876ssa2gah55vl362wsj7xgf21"; + name = "frameworkintegration-5.108.0.tar.xz"; }; }; kactivities = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kactivities-5.107.0.tar.xz"; - sha256 = "0acv2grpq083289am1is012mjp8snsg7i57byw9qnniflwwrbdqr"; - name = "kactivities-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kactivities-5.108.0.tar.xz"; + sha256 = "0lqhfml91wh9376xr31ky8fl49yamfzz336bdjzj3i3ygqzyc7lh"; + name = "kactivities-5.108.0.tar.xz"; }; }; kactivities-stats = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kactivities-stats-5.107.0.tar.xz"; - sha256 = "1hp1ckmrjhmzx9ll2v974bf7hsccbpf76vlvxc47jl7b5x5l5337"; - name = "kactivities-stats-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kactivities-stats-5.108.0.tar.xz"; + sha256 = "03vpangw2zl2577vhcn0w1pp2hv3jgna79b18wv7i13s78v8k6ny"; + name = "kactivities-stats-5.108.0.tar.xz"; }; }; kapidox = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kapidox-5.107.0.tar.xz"; - sha256 = "1gxzxpv6lhz0hdkzq4vlv5dv715bfpf3wvdd9a0hm1v75lgl8aap"; - name = "kapidox-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kapidox-5.108.0.tar.xz"; + sha256 = "1xpapgzja66lwxagrynns2ycx4cdllld5b3xrxg67si3bjz9p70a"; + name = "kapidox-5.108.0.tar.xz"; }; }; karchive = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/karchive-5.107.0.tar.xz"; - sha256 = "0zsay002lsq5a8a9dqg97zzcv75rlbkklyv21qv8za7qk95vk378"; - name = "karchive-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/karchive-5.108.0.tar.xz"; + sha256 = "1rbmh0sfrgv7nkmmnf8zyd5x66g9bh6kj9ry2yzivqn73ralk44y"; + name = "karchive-5.108.0.tar.xz"; }; }; kauth = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kauth-5.107.0.tar.xz"; - sha256 = "1zwgvf1qhi2ls4lal735xgfgibk0q7h9x84v2s7zymww7fdpzg86"; - name = "kauth-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kauth-5.108.0.tar.xz"; + sha256 = "0xn0v1rzjsv1a856zcw9s9qkbfaq184663akc5rrapvvfcrm2vjz"; + name = "kauth-5.108.0.tar.xz"; }; }; kbookmarks = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kbookmarks-5.107.0.tar.xz"; - sha256 = "16gd3ijfpkvs5rzvk6bx8ydbz9dx0chv3m3zxxq4khcqbk8gmlah"; - name = "kbookmarks-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kbookmarks-5.108.0.tar.xz"; + sha256 = "1547i2x7mrryg4w6ij47f37savmp1jmq8wp2nhiij65cdnla3qbb"; + name = "kbookmarks-5.108.0.tar.xz"; }; }; kcalendarcore = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcalendarcore-5.107.0.tar.xz"; - sha256 = "0iswnbl73in465kgwbn9n3rllw82nasc31897nqc9ifcs6x45msl"; - name = "kcalendarcore-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcalendarcore-5.108.0.tar.xz"; + sha256 = "1wxlixz7624p7693lwxgdzyi30n9zgs0mgvwldp0q0llzpxqp5yv"; + name = "kcalendarcore-5.108.0.tar.xz"; }; }; kcmutils = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcmutils-5.107.0.tar.xz"; - sha256 = "1mahi2zxi3f8m45iynlgwxjz4g5aq0qg68sy7c85h6pvvg6dd626"; - name = "kcmutils-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcmutils-5.108.0.tar.xz"; + sha256 = "1zhs84wrd8fkgzxwf793c6yha5nsnid4id8vs4iy7gcyahyajchr"; + name = "kcmutils-5.108.0.tar.xz"; }; }; kcodecs = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcodecs-5.107.0.tar.xz"; - sha256 = "088jl5spmwm4ihmpgk17bsmkcjfn2323cypa12zrpcm4q1iqbc07"; - name = "kcodecs-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcodecs-5.108.0.tar.xz"; + sha256 = "12vav9ncxcf0vpmfp7wps91ax7azrwaxhqdq8z52vcyl0rvgy341"; + name = "kcodecs-5.108.0.tar.xz"; }; }; kcompletion = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcompletion-5.107.0.tar.xz"; - sha256 = "1xa9ckz9vhxb5m81m7hky68b96vfaq071vfhqs7zjaq9s9rn9ash"; - name = "kcompletion-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcompletion-5.108.0.tar.xz"; + sha256 = "0fgz30fb6wp2jb7bii5wy6akdzjiqy73w5mnmv0hi15mj2jkpgdq"; + name = "kcompletion-5.108.0.tar.xz"; }; }; kconfig = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kconfig-5.107.0.tar.xz"; - sha256 = "04svxr0pckqwx1kkvzsbgcqk5m921x6hps7pk7gn4pi5lnyd95wn"; - name = "kconfig-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kconfig-5.108.0.tar.xz"; + sha256 = "0gq30f5yx3razkn12zq7224sivl76jikf7c4xdfc9fw1k54sxbjd"; + name = "kconfig-5.108.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kconfigwidgets-5.107.0.tar.xz"; - sha256 = "0s608laxgdkzn33p0bb22yaa2w3brapbw4dcpnylc6rimdw8avgi"; - name = "kconfigwidgets-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kconfigwidgets-5.108.0.tar.xz"; + sha256 = "1raz1bxra0dvcwwzvhfmz1y0hvfrffpdymd116xyi5lnavyzdp46"; + name = "kconfigwidgets-5.108.0.tar.xz"; }; }; kcontacts = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcontacts-5.107.0.tar.xz"; - sha256 = "17dhbzgizqv5g3qf4wsaf8jgragjfmcrly4c761x5l3c7vwwrjiv"; - name = "kcontacts-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcontacts-5.108.0.tar.xz"; + sha256 = "15x6f05ngs3nmxpdi11bi4k4zpjnvx5cy3yxbdklls3f2wpq6jd4"; + name = "kcontacts-5.108.0.tar.xz"; }; }; kcoreaddons = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcoreaddons-5.107.0.tar.xz"; - sha256 = "115g3qmfpirvvqj0a2jyi9lgpahw19wc9351mfc2gasj914fxfk4"; - name = "kcoreaddons-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcoreaddons-5.108.0.tar.xz"; + sha256 = "0l8f59ijmcjvrpgysvrw2nmh3jqlzhlqxmgrvybipxpywams3cy8"; + name = "kcoreaddons-5.108.0.tar.xz"; }; }; kcrash = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kcrash-5.107.0.tar.xz"; - sha256 = "15gngmgridnxzz04f4mrw9c53l95qi9z3sj9wprlx9d0kgacs5sl"; - name = "kcrash-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kcrash-5.108.0.tar.xz"; + sha256 = "1990yfssxcmbpbq9pz2nv07fpnjih4q9ql2bz1nfnanrm858pi9y"; + name = "kcrash-5.108.0.tar.xz"; }; }; kdav = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kdav-5.107.0.tar.xz"; - sha256 = "0vwv1b3vlz1gizwrj1x4hkdzbkc1vad2mih0qlbhwdlxnx6sb7ap"; - name = "kdav-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kdav-5.108.0.tar.xz"; + sha256 = "0knpyzdfa0m1pyakq32pw2hwbaq2dkqj87p3n6p86wlf2rn66vir"; + name = "kdav-5.108.0.tar.xz"; }; }; kdbusaddons = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kdbusaddons-5.107.0.tar.xz"; - sha256 = "1f09xf4cm8qk4iklnr60yr2nm054ixnbh85diajbcm5j3v1y75jf"; - name = "kdbusaddons-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kdbusaddons-5.108.0.tar.xz"; + sha256 = "1siv9ndk0zr9yq6pwjs248zzsh4kgllfj1294jym80rxcb0z6g9r"; + name = "kdbusaddons-5.108.0.tar.xz"; }; }; kdeclarative = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kdeclarative-5.107.0.tar.xz"; - sha256 = "0m88i376jc4m80vlzz8wprg1cwvxvr4438n2i89jpz3nh63fsl6z"; - name = "kdeclarative-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kdeclarative-5.108.0.tar.xz"; + sha256 = "1kdg18a2xpgl6xkrk68nnbj57nwn8rv5yd5q5bfbfc8chibk9y4z"; + name = "kdeclarative-5.108.0.tar.xz"; }; }; kded = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kded-5.107.0.tar.xz"; - sha256 = "0fxpx3k9j8xnrwvqszj9m7s8vpdxjkz9jschc0m6pfqiqk7hhbyg"; - name = "kded-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kded-5.108.0.tar.xz"; + sha256 = "08aa3vjzr0mj4jahzqd2z7k8whavyyvcyhk67swqlpil9rmxm0s1"; + name = "kded-5.108.0.tar.xz"; }; }; kdelibs4support = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kdelibs4support-5.107.0.tar.xz"; - sha256 = "13qccs1f26ap4q1naiyknvp0p746zw4439yj4m3p6c3jd25md57g"; - name = "kdelibs4support-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kdelibs4support-5.108.0.tar.xz"; + sha256 = "1pqpcn4i6zcli8a2yf7fda6rwr0vs55jd9bjl0fgallyd6wl8qkf"; + name = "kdelibs4support-5.108.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kdesignerplugin-5.107.0.tar.xz"; - sha256 = "0lxyfyyfs7ykdz201zlycphnpr9lf3qr61a1914a5rkxqczc93b8"; - name = "kdesignerplugin-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kdesignerplugin-5.108.0.tar.xz"; + sha256 = "0ibd1sgyiawl7b25ag1qs80s0vai16ab1zmdrhx85gd1583vkyab"; + name = "kdesignerplugin-5.108.0.tar.xz"; }; }; kdesu = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kdesu-5.107.0.tar.xz"; - sha256 = "12hma81sqirfb848vac6igs68vb982rk5pyj3ypnc7jn13jif43x"; - name = "kdesu-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kdesu-5.108.0.tar.xz"; + sha256 = "1rhygp1r6099zrmnfvl2ldpm6rsilcy2x3bcb580bvqd536ir2yh"; + name = "kdesu-5.108.0.tar.xz"; }; }; kdewebkit = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kdewebkit-5.107.0.tar.xz"; - sha256 = "0dxnshx629az0dgpiy126by079x3gpxbhhg01z65c06dnlcjhl35"; - name = "kdewebkit-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kdewebkit-5.108.0.tar.xz"; + sha256 = "11d8swj6n24hdi7dr2nz8fi20ra8jfl9rkzlcsyzyblwaqc0fpzi"; + name = "kdewebkit-5.108.0.tar.xz"; }; }; kdnssd = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kdnssd-5.107.0.tar.xz"; - sha256 = "1jnh3dx2yxf9pz09majdzms7n398zfard1ggjp19jqnpa51vap0m"; - name = "kdnssd-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kdnssd-5.108.0.tar.xz"; + sha256 = "0pxlkwjjl2gzfjf9pd7j9m1nhc6jas0wd8994jgljgxc5dc94cn8"; + name = "kdnssd-5.108.0.tar.xz"; }; }; kdoctools = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kdoctools-5.107.0.tar.xz"; - sha256 = "0l0mf5hahn2s5yj7khqrxc8w1fxgwibbx5zz35s0xqaz7x4s0mlx"; - name = "kdoctools-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kdoctools-5.108.0.tar.xz"; + sha256 = "0zi3va3jn4jps9h9h94ivxkzxw7v5vqwxgikb321hnnjgxy4nzwr"; + name = "kdoctools-5.108.0.tar.xz"; }; }; kemoticons = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kemoticons-5.107.0.tar.xz"; - sha256 = "0k1yjm8ybbhm55xh46hl2h6c4cqh4hq8sryc6pjjg1fh6a179y2n"; - name = "kemoticons-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kemoticons-5.108.0.tar.xz"; + sha256 = "0p7q5s9mv7j0sy4mm513warzhqm44wiz4vxcp9kxbqcsw0awfad6"; + name = "kemoticons-5.108.0.tar.xz"; }; }; kfilemetadata = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kfilemetadata-5.107.0.tar.xz"; - sha256 = "1bcapkmz0zlbknl57byiyalrpk42gvgdycwq6jy9ij5p8m6z7d7d"; - name = "kfilemetadata-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kfilemetadata-5.108.0.tar.xz"; + sha256 = "0hhq8p6wpfbi33b604ls7q9309n6pm4aa4cgjwxrspn2q8yn6p7w"; + name = "kfilemetadata-5.108.0.tar.xz"; }; }; kglobalaccel = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kglobalaccel-5.107.0.tar.xz"; - sha256 = "1n4y6hwr53paabi4vlzsl8z82blrmvh3g3xhswdcw4dq6m1q4x58"; - name = "kglobalaccel-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kglobalaccel-5.108.0.tar.xz"; + sha256 = "0sf6v86pfhxva7n465p9pfidyzfjviam5kk8d6lrc23zjb559f3w"; + name = "kglobalaccel-5.108.0.tar.xz"; }; }; kguiaddons = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kguiaddons-5.107.0.tar.xz"; - sha256 = "1hc4k7vynxrvbrb66vw3la2ixhm96dz3basbwl6j6g6xlxn6wbxd"; - name = "kguiaddons-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kguiaddons-5.108.0.tar.xz"; + sha256 = "01yfv2ybqi894g7d1fy584x0nbmqlm7vi0b998zc52233blh8j51"; + name = "kguiaddons-5.108.0.tar.xz"; }; }; kholidays = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kholidays-5.107.0.tar.xz"; - sha256 = "0b23lb2dqhnkizr3pa9bj2z6rq1613q3cyfh770pksfps7lp0mna"; - name = "kholidays-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kholidays-5.108.0.tar.xz"; + sha256 = "03g484nm37vv8mnj4q6y6pdrhhiglni3s63gpxhc54zzhzxshpy5"; + name = "kholidays-5.108.0.tar.xz"; }; }; khtml = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/khtml-5.107.0.tar.xz"; - sha256 = "1zcms5h78nc0c69ah60lmjxq6ymb3213ya41hfx7q998dzd9fi9v"; - name = "khtml-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/khtml-5.108.0.tar.xz"; + sha256 = "0kasxgkxfibdj81a6iiv4ciqy5fd180lsk9sa1byd8y0bydd8kjv"; + name = "khtml-5.108.0.tar.xz"; }; }; ki18n = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/ki18n-5.107.0.tar.xz"; - sha256 = "1q4bbv14davg8pcxr1ngkbzk2q37m6lf2wzxiim7ydkm3giqzp8p"; - name = "ki18n-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/ki18n-5.108.0.tar.xz"; + sha256 = "0kpza0n900j8lf27d60ikl963616vcqnns8va6cg8y2lf2pmxvsr"; + name = "ki18n-5.108.0.tar.xz"; }; }; kiconthemes = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kiconthemes-5.107.0.tar.xz"; - sha256 = "0by44ra385kwj006l9jkqlpyqci79cspg3y41h3f0m4xpi4dn5sx"; - name = "kiconthemes-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kiconthemes-5.108.0.tar.xz"; + sha256 = "0r8lz4jkb1g46ll79pdv8bmig1ij8fp7k6cpcy9nhkkhq0ra7svk"; + name = "kiconthemes-5.108.0.tar.xz"; }; }; kidletime = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kidletime-5.107.0.tar.xz"; - sha256 = "0b3plz0hkxw0i8kklv79mfbk79x6p1swz6ffs4dz04hj3cl9lh1v"; - name = "kidletime-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kidletime-5.108.0.tar.xz"; + sha256 = "0cqb33xyqxh507332c30ja5anq99zj250b4sl6r6bn1z6j7yfzx7"; + name = "kidletime-5.108.0.tar.xz"; }; }; kimageformats = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kimageformats-5.107.0.tar.xz"; - sha256 = "1hfisk63anns3zsakgc4k4fhbx9ic2a4k75jxsmd337rdg9ql9cp"; - name = "kimageformats-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kimageformats-5.108.0.tar.xz"; + sha256 = "07myvknlvp28kn20l30x6q22fkva72qrfziryinxgsqlhgc3j87c"; + name = "kimageformats-5.108.0.tar.xz"; }; }; kinit = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kinit-5.107.0.tar.xz"; - sha256 = "1p28m3cvifgdw1rjzqy5xbvyzq383yhr50bkq6xn6b12ar239znf"; - name = "kinit-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kinit-5.108.0.tar.xz"; + sha256 = "1i03gn0s01jg2ridlymxf34ib88rkf30yz27h38g9fzaijjr46fi"; + name = "kinit-5.108.0.tar.xz"; }; }; kio = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kio-5.107.0.tar.xz"; - sha256 = "1bj8mi112xh5zi56i84d96jdc2ji2h72rhl126kfj88chdb1hsj5"; - name = "kio-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kio-5.108.0.tar.xz"; + sha256 = "1v5bpj90s5pwdvdkzcfpfgsgym7pxb3r22m4r7w9piq6n9s4c122"; + name = "kio-5.108.0.tar.xz"; }; }; kirigami2 = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kirigami2-5.107.0.tar.xz"; - sha256 = "1jdr1i74f90wkjgfyd3ickxwcjmkn1y78v3ggybkrqfx7lvd3hzm"; - name = "kirigami2-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kirigami2-5.108.0.tar.xz"; + sha256 = "0kbzqkvq169w9kl4z7l7zd21mgxqdsyv8ia2j6cwd3qqn4xd3nbp"; + name = "kirigami2-5.108.0.tar.xz"; }; }; kitemmodels = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kitemmodels-5.107.0.tar.xz"; - sha256 = "1bqiia07c4kbw89j0rw9dx7idflml7wr7sdkg9rmyq6hlpkamxdp"; - name = "kitemmodels-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kitemmodels-5.108.0.tar.xz"; + sha256 = "05dd1d1dxkbjrr6x73ndsrabzaa02m3cn1h4dmsgpydy1rkzbj9v"; + name = "kitemmodels-5.108.0.tar.xz"; }; }; kitemviews = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kitemviews-5.107.0.tar.xz"; - sha256 = "05qbl1r0js6rxdgz9ym6kpv3rlq4prxy121f8z0c224vivp0qinm"; - name = "kitemviews-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kitemviews-5.108.0.tar.xz"; + sha256 = "13dcy804lv6ws1gdfjczkbnlyig11ir4p2mi26ashbgrdfpywxv1"; + name = "kitemviews-5.108.0.tar.xz"; }; }; kjobwidgets = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kjobwidgets-5.107.0.tar.xz"; - sha256 = "14kbj31ghmx2wsl79dmgvkfzxlbrpds1z12mj6z91665vrmspq96"; - name = "kjobwidgets-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kjobwidgets-5.108.0.tar.xz"; + sha256 = "0vhv9gx8qq73hvalcyx4g8c1ji9qxb2rn5wp4mdl7n9pypd0gscq"; + name = "kjobwidgets-5.108.0.tar.xz"; }; }; kjs = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kjs-5.107.0.tar.xz"; - sha256 = "0d985bsvrqbfj068l3si3z0a6b9m6xz4zm6k3p7qh4382blb8dka"; - name = "kjs-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kjs-5.108.0.tar.xz"; + sha256 = "0xwih1jrdkgymr29cqr2jbj7byf8kqnbapr7wc8s0jxm5cwj2fgh"; + name = "kjs-5.108.0.tar.xz"; }; }; kjsembed = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kjsembed-5.107.0.tar.xz"; - sha256 = "1aridyby0aiakqsn58575hajhh8il5w48n41dh4ng6ax86d4jvkj"; - name = "kjsembed-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kjsembed-5.108.0.tar.xz"; + sha256 = "1nfi9mfph3yjglafm8clw8d1z4f4h9b71j5z4l50qsds65yv9b9a"; + name = "kjsembed-5.108.0.tar.xz"; }; }; kmediaplayer = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kmediaplayer-5.107.0.tar.xz"; - sha256 = "1m0iik73qia33yvpkirn3f8vpmwxyz69gaddxm2ac0n0xjznxrmj"; - name = "kmediaplayer-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kmediaplayer-5.108.0.tar.xz"; + sha256 = "1vkx11736wq0idxrzmfg6s2lcrilgl7yh7a97la6c3qqj2aggi08"; + name = "kmediaplayer-5.108.0.tar.xz"; }; }; knewstuff = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/knewstuff-5.107.0.tar.xz"; - sha256 = "16zjjamp2myb45v4wm6k00h9ghp7rgszjdb3ph1sh9fm86x3bnbq"; - name = "knewstuff-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/knewstuff-5.108.0.tar.xz"; + sha256 = "1hlzkacybf35lnl92vk8xkapkq5pygy8fqngskvj9f4692k6562s"; + name = "knewstuff-5.108.0.tar.xz"; }; }; knotifications = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/knotifications-5.107.0.tar.xz"; - sha256 = "0xigm6cgsdfa74nn4p3f66xfi4rkb1ynmisbf3bh6kf58rq4f7gf"; - name = "knotifications-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/knotifications-5.108.0.tar.xz"; + sha256 = "05qdmjjxj362zhwyk0vv83wfzsgjd4nxnvk2avhiscr2k46swn96"; + name = "knotifications-5.108.0.tar.xz"; }; }; knotifyconfig = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/knotifyconfig-5.107.0.tar.xz"; - sha256 = "0ydjxyalmx4364m2idmqahzyb351mq4bi1jf7ibs934lra7mdwg8"; - name = "knotifyconfig-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/knotifyconfig-5.108.0.tar.xz"; + sha256 = "1dby6ycqicsij9ngyk6ab7v14ybnsmxd51fkcy25k4c326w6yyca"; + name = "knotifyconfig-5.108.0.tar.xz"; }; }; kpackage = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kpackage-5.107.0.tar.xz"; - sha256 = "1ch4qj1sjwsf56ywqgns9ka07lc4dcw0j5hr75pibdvaap0n1bph"; - name = "kpackage-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kpackage-5.108.0.tar.xz"; + sha256 = "18185xi48an6fi0dinzfcc50lzq8cb5dx16sikmavcnhmfvlvw1g"; + name = "kpackage-5.108.0.tar.xz"; }; }; kparts = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kparts-5.107.0.tar.xz"; - sha256 = "1yx9iyd9r740hph24mc96gfql0vdd5s4mrixyk0lr3lj8j35bf00"; - name = "kparts-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kparts-5.108.0.tar.xz"; + sha256 = "0fckq2dpdqkqyaig61fnjanw2y9j28fckx1zrywnvyzd8q6hs4db"; + name = "kparts-5.108.0.tar.xz"; }; }; kpeople = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kpeople-5.107.0.tar.xz"; - sha256 = "18hr9ci9qbgrwds44knv1xcqxi71b04bw4xh3v1h2sw44srnwplj"; - name = "kpeople-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kpeople-5.108.0.tar.xz"; + sha256 = "0k2jnyp05rnjb4j31w4xi95qwparkqvp1m9664gvygwp9xxlnf4k"; + name = "kpeople-5.108.0.tar.xz"; }; }; kplotting = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kplotting-5.107.0.tar.xz"; - sha256 = "0gnk1rsrznmyq11f3r9i5pgfb9szscyhif1x0pns1qj24ax3sv2c"; - name = "kplotting-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kplotting-5.108.0.tar.xz"; + sha256 = "1rnkwxxms2raqswgwm0i4xgjqpzkz7wl2kbdra2gqscfz7a23s4p"; + name = "kplotting-5.108.0.tar.xz"; }; }; kpty = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kpty-5.107.0.tar.xz"; - sha256 = "1y0k92p8j3hpi6si3lqlvh121v8wqybqxhqkf3ygqhld23scazlh"; - name = "kpty-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kpty-5.108.0.tar.xz"; + sha256 = "11k1jv2wazlxbz5y7l94zsykcq544k1zbb49ximbdh45r3p5hdgw"; + name = "kpty-5.108.0.tar.xz"; }; }; kquickcharts = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kquickcharts-5.107.0.tar.xz"; - sha256 = "1xxrnkxxc8rjvy15zdp3fgiwrfzf67ib7jaxlax8f1s74mr76b4l"; - name = "kquickcharts-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kquickcharts-5.108.0.tar.xz"; + sha256 = "1wdmgala480qjipzpq9v85vy1i3n0qgria0rgn26ibhm2wmvmrpw"; + name = "kquickcharts-5.108.0.tar.xz"; }; }; kross = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kross-5.107.0.tar.xz"; - sha256 = "13myij7bx0id6vrwnrimfgjq3dwjw5rnpdpg09iawbzjx9yaq3iz"; - name = "kross-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kross-5.108.0.tar.xz"; + sha256 = "0j459d9610aayvzb1d9m045c71dmkgqx5bsx3lv8x1wffk8064sd"; + name = "kross-5.108.0.tar.xz"; }; }; krunner = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/krunner-5.107.0.tar.xz"; - sha256 = "06r27jmhqjifpv7fkyhin8qdygf3qzgmz2n34sa366qk5h1fij3m"; - name = "krunner-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/krunner-5.108.0.tar.xz"; + sha256 = "0yam10c31jzwsl4qzrrcr4caxk79jqg1fyrsavjzg14ahsknb5ih"; + name = "krunner-5.108.0.tar.xz"; }; }; kservice = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kservice-5.107.0.tar.xz"; - sha256 = "0bgr2jv11cjfb5fkq5ki39xin3kjqk0jbrjg419pay8xj90nsgq6"; - name = "kservice-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kservice-5.108.0.tar.xz"; + sha256 = "10dfnq3x9b30kbkpq1ifg6ywj8dmdqvd1szgrwf71077yzgsh9w2"; + name = "kservice-5.108.0.tar.xz"; }; }; ktexteditor = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/ktexteditor-5.107.0.tar.xz"; - sha256 = "165wrv5bdmixczcf1jr0j06fh31n5rchq24d4856p18vl56wg4cg"; - name = "ktexteditor-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/ktexteditor-5.108.0.tar.xz"; + sha256 = "0raz9h9y7zfynvacg4grwj0sd4v6w2kwpjkirvjr14zmfjq92mif"; + name = "ktexteditor-5.108.0.tar.xz"; }; }; ktextwidgets = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/ktextwidgets-5.107.0.tar.xz"; - sha256 = "1yx0dlvz5ssn5wqpx606vrzdfq14akpvmlayg41sx6hs4xzv0rjy"; - name = "ktextwidgets-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/ktextwidgets-5.108.0.tar.xz"; + sha256 = "1qz1ayrrqxarhx4h24ym2hm8gkjskgdi268jv16yvd33b122fv2c"; + name = "ktextwidgets-5.108.0.tar.xz"; }; }; kunitconversion = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kunitconversion-5.107.0.tar.xz"; - sha256 = "1y96gqkh7qvs37kb4f0gcqx2f2ilgcryxvcyfbngp3l4fpnvxxaw"; - name = "kunitconversion-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kunitconversion-5.108.0.tar.xz"; + sha256 = "1kwz5wx0s522mwb5gxjz6cxqdkzflcckmra9qikpjrzsngamrq3j"; + name = "kunitconversion-5.108.0.tar.xz"; }; }; kwallet = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kwallet-5.107.0.tar.xz"; - sha256 = "0xqx3gvqbgjvbp362wr0d42p4wcvwk0f5gqib8qa6zik3w0nly9f"; - name = "kwallet-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kwallet-5.108.0.tar.xz"; + sha256 = "1zx80h8mj3ijj1mm5m3396vwkfhpdm8qpb63rhg8szm9hwqhd5sq"; + name = "kwallet-5.108.0.tar.xz"; }; }; kwayland = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kwayland-5.107.0.tar.xz"; - sha256 = "0j8hjv9v2yxn922xd1lxlx017c658w2zs3ah0f343sl8cwbj2p45"; - name = "kwayland-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kwayland-5.108.0.tar.xz"; + sha256 = "11xk1rzizmqb0haqkg24kdd54a3fdqrxr2kh056irbnksp9p8k03"; + name = "kwayland-5.108.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kwidgetsaddons-5.107.0.tar.xz"; - sha256 = "1jc7x0n1052pykmps3mpb06jj2pyyvcv0f5v2qymbxf36fcrp88g"; - name = "kwidgetsaddons-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kwidgetsaddons-5.108.0.tar.xz"; + sha256 = "1a7svxd0c5dzx5pqjddc38cybf21wrg1hfz91gkrlv9f7ai0k878"; + name = "kwidgetsaddons-5.108.0.tar.xz"; }; }; kwindowsystem = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kwindowsystem-5.107.0.tar.xz"; - sha256 = "07lkqqzbgnx6v4fzrcdi5xwznxs21rgg96j8ghs6s3zph8y7ram3"; - name = "kwindowsystem-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kwindowsystem-5.108.0.tar.xz"; + sha256 = "0112cgy09qw069v1lzaz6rp84p128mq3xqp3xink398xhp3nrkqd"; + name = "kwindowsystem-5.108.0.tar.xz"; }; }; kxmlgui = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/kxmlgui-5.107.0.tar.xz"; - sha256 = "1rc420zlmiivb4x00dlr9z8035crw974gviwzs6xag1v9j022j2b"; - name = "kxmlgui-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/kxmlgui-5.108.0.tar.xz"; + sha256 = "0v6nzq86wvbalbqq3dp47vymp31ws098c8dq0g43f6g7q3xjfxa1"; + name = "kxmlgui-5.108.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/portingAids/kxmlrpcclient-5.107.0.tar.xz"; - sha256 = "0yfbbqkwbrfsanwf0kph5d81xyply17swxmnz5w5qwasdhk19chc"; - name = "kxmlrpcclient-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/portingAids/kxmlrpcclient-5.108.0.tar.xz"; + sha256 = "0pf5c5ja1mwdlf9pmc2601frwskkzhksz0n8w4qcwmwbaxrbspv0"; + name = "kxmlrpcclient-5.108.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/modemmanager-qt-5.107.0.tar.xz"; - sha256 = "0ff4sq4wq12qdrkb53wbnjdsccarf8bl6kpv831q0jhhbv06xpy1"; - name = "modemmanager-qt-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/modemmanager-qt-5.108.0.tar.xz"; + sha256 = "1rkz1m2dlfhny9zvy8axzgjxgh41cfnmpb52rwargmrsgplcx7rz"; + name = "modemmanager-qt-5.108.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/networkmanager-qt-5.107.0.tar.xz"; - sha256 = "0zqrsgq68n5wdw06sq75sgk63by41lr24dink6gkh8r0yqzgspv9"; - name = "networkmanager-qt-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/networkmanager-qt-5.108.0.tar.xz"; + sha256 = "0y9h1n4hccdzk5rp2bq7dyq617yg5myq7dcwnpnp1aik40647vjf"; + name = "networkmanager-qt-5.108.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/oxygen-icons5-5.107.0.tar.xz"; - sha256 = "1l6glxkq62lzpzr6hvqwn3xb4jfw79w69nwjbbs5imbxndcrmz9s"; - name = "oxygen-icons5-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/oxygen-icons5-5.108.0.tar.xz"; + sha256 = "0w9zcgii9z91060cnqcalv8vnj03xrnjr5k6crx28szrpplqcvxd"; + name = "oxygen-icons5-5.108.0.tar.xz"; }; }; plasma-framework = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/plasma-framework-5.107.0.tar.xz"; - sha256 = "0ahgpwmaz2nnyg4qwf8ppdk70a718v65ldk8si6gvglf95daalv0"; - name = "plasma-framework-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/plasma-framework-5.108.0.tar.xz"; + sha256 = "131zxamyim4bpk006nmfw2zmcay5qnmm7lmy8rvcxn96vflrs6bb"; + name = "plasma-framework-5.108.0.tar.xz"; }; }; prison = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/prison-5.107.0.tar.xz"; - sha256 = "172alrpknjnc97ds1dizwgki40z82p1vzld2gib6pwykgzgjww6c"; - name = "prison-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/prison-5.108.0.tar.xz"; + sha256 = "1pn62pd7jy589z9y5r00m8d5rcqvrbskyr4a2yyfs24xv21x8lw4"; + name = "prison-5.108.0.tar.xz"; }; }; purpose = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/purpose-5.107.0.tar.xz"; - sha256 = "0b4x7x3kia5vn913mzfk0k0f0lhf0gpc3kjsw9pgy1mna8dg7kcr"; - name = "purpose-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/purpose-5.108.0.tar.xz"; + sha256 = "0gzgdycf96z0x61vs08dh46n9c2zc11zpjscfwzhrg2k9wsb90qd"; + name = "purpose-5.108.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/qqc2-desktop-style-5.107.0.tar.xz"; - sha256 = "0hpjy5w72hzihc7famdjj5arac8fw0d149iqpywldyzhk6bnrfaw"; - name = "qqc2-desktop-style-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/qqc2-desktop-style-5.108.0.tar.xz"; + sha256 = "1icv871q0z2wh147j3bg9xqizp2cyrsrsrsgbyyscpa9x5nlpvw9"; + name = "qqc2-desktop-style-5.108.0.tar.xz"; }; }; solid = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/solid-5.107.0.tar.xz"; - sha256 = "1w5b62hx8icjz8wkhkn0mhaykdm4mglf6d8qh759160v85fi2ia2"; - name = "solid-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/solid-5.108.0.tar.xz"; + sha256 = "0m4i7csrz167nm6h4pcd0413x6jvnd39cx13k9ayga9my36ba2r8"; + name = "solid-5.108.0.tar.xz"; }; }; sonnet = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/sonnet-5.107.0.tar.xz"; - sha256 = "0ix7jqjdlcd4jksrvgy5whpbl0i2ljs7pxkm9f8yg2pm3h5clgda"; - name = "sonnet-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/sonnet-5.108.0.tar.xz"; + sha256 = "00azygjvv0fw5agd28v3kqxc3qx1wa8j4afvn5y3ncarhb5ac7p1"; + name = "sonnet-5.108.0.tar.xz"; }; }; syndication = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/syndication-5.107.0.tar.xz"; - sha256 = "0jpqn34za7q62f8x2njyggq52h9riljr053ng25ykqvp3z2khk95"; - name = "syndication-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/syndication-5.108.0.tar.xz"; + sha256 = "0q1yhziwxj2dllqyapkqnsskhvzsjm5iz2my4pn8n0lfm90rdf8h"; + name = "syndication-5.108.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/syntax-highlighting-5.107.0.tar.xz"; - sha256 = "1narmiqlmgnhzxbwmcm4si8w684q3fdp4zh25w0kvwdvxvlx2bk7"; - name = "syntax-highlighting-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/syntax-highlighting-5.108.0.tar.xz"; + sha256 = "1lri80bv4i50xsd2wgyv383sqkxpav3smgk9ql5dil2n8pl219ky"; + name = "syntax-highlighting-5.108.0.tar.xz"; }; }; threadweaver = { - version = "5.107.0"; + version = "5.108.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.107/threadweaver-5.107.0.tar.xz"; - sha256 = "1wis770hbmzq920fnfg0pvz35bf4abbkkbnx7za9f89b7jpzmi66"; - name = "threadweaver-5.107.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.108/threadweaver-5.108.0.tar.xz"; + sha256 = "094nfqbhgg8yfri7fghn8dkjdf1k5iccshj0ns2b30snw87w8b29"; + name = "threadweaver-5.108.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kronosnet/default.nix b/nixpkgs/pkgs/development/libraries/kronosnet/default.nix index 7fb8520348a2..e6b8ced1a01b 100644 --- a/nixpkgs/pkgs/development/libraries/kronosnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.25"; + version = "1.26"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-NEmkgKTm+R4lzqjbQTyQ6TDpjoTQtMKiTpzn25HUfYk="; + sha256 = "sha256-LkV5bi1kMRP2ofBIe+hbOzbSRStWyr3afnNdZqpVDBA="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index 72ae892dca2c..95547fb6382a 100644 --- a/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.6.2"; + version = "2.7.2"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - hash = "sha256-XLxjw1KTwjSzn5S6n/yonW0HiSXX+QIfgIZz3t8tkl4="; + hash = "sha256-Ju5y1keFTmYtmWQ+srLTQWVavzH0mQg41mUPtc+SCcg="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/nixpkgs/pkgs/development/libraries/leptonica/default.nix index fd020603b523..ceb42cd49154 100644 --- a/nixpkgs/pkgs/development/libraries/leptonica/default.nix +++ b/nixpkgs/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.83.0"; + version = "1.83.1"; src = fetchurl { - url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4="; + url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-jxhhXgdDr3339QmFxzDfzwyTVIBz0fVmIeQVaotU090="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/nixpkgs/pkgs/development/libraries/level-zero/default.nix index 0f001f84f2c2..a117863aa337 100644 --- a/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.11.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-hCipWbhVsYYqfGXO6CFDPmxiFO7Dc0I/nCnj6lRS2go="; + hash = "sha256-qV2OM41+DkuT3lDCTHOyNkHixD/HITfCiItBQX6Ewio="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix index 8cac5df55ea2..f5e7e2a638d2 100644 --- a/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "leveldb"; - rev = "${version}"; + rev = version; sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI="; }; diff --git a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index 56af02785979..0da54cd61c07 100644 --- a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -29,10 +29,13 @@ stdenv.mkDerivation rec { ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); postPatch = '' + # This lets us build the tests properly on aarch64-darwin. + substituteInPlace CMakeLists.txt \ + --replace 'SET(CMAKE_OSX_ARCHITECTURES "x86_64")' "" + # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in - # replace bundled binaries for i in AutomaticComponentToolkit/bin/act.*; do ln -sf ${automaticcomponenttoolkit}/bin/act $i diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 772096c8f23a..e4f5dbdc864e 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.2"; + version = "1.3.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-9Qha8xN3lC/t5dQNYPbgMX6HAKgEk80pyycrd5MGYLo="; + hash = "sha256-YIxGwl+/F7xkGjoi07GViSHAfCTE1RpEBhHfrlD0X/4="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix index 180a8874e50e..99a847af0b87 100644 --- a/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.24"; + version = "4.3.26"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-65/LsH1ZDkeBrtQUmKc5/5C2ce4nw4nSHXnJqZMKenI="; + sha256 = "sha256-lHkYoppJ/wo6RRE6V4iN6JXz5OoErJUl4IyrwiCB9FM="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/nixpkgs/pkgs/development/libraries/libargon2/default.nix index 4eb28fb02fe2..ae9ba47cdc3f 100644 --- a/nixpkgs/pkgs/development/libraries/libargon2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libargon2/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { "ARGON2_VERSION=${version}" "LIBRARY_REL=lib" "PKGCONFIG_REL=lib" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "LIBRARIES=$(LIB_ST)" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libargs/default.nix b/nixpkgs/pkgs/development/libraries/libargs/default.nix index 79572e430013..5247aa5a94f5 100644 --- a/nixpkgs/pkgs/development/libraries/libargs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libargs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A simple header-only C++ argument parser library"; homepage = "https://github.com/Taywee/args"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/nixpkgs/pkgs/development/libraries/libassuan/default.nix index a807226f75ab..60c13040ae5e 100644 --- a/nixpkgs/pkgs/development/libraries/libassuan/default.nix +++ b/nixpkgs/pkgs/development/libraries/libassuan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libassuan"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-jowvzJgvnKZ9y7HZXi3HRrFzmkZovCCzo8W+Yy7bNOQ="; + sha256 = "sha256-6f0nIY1TlJBOTjl4j5sXQnEcPmtBaJoxqjOAvVqk9CY="; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix new file mode 100644 index 000000000000..aa818a04abea --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, testers +, cmake +, cmake-extras +, glib +, gobject-introspection +, gtest +, intltool +, pkg-config +, systemd +, vala +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libayatana-common"; + version = "0.9.8"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "libayatana-common"; + rev = finalAttrs.version; + hash = "sha256-5cHFjBQ3NgNaoprPrFytnrwBRL7gDG7QZLWomgGBJMg="; + }; + + postPatch = '' + # Queries via pkg_get_variable, can't override prefix + substituteInPlace data/CMakeLists.txt \ + --replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gobject-introspection + intltool + pkg-config + vala + ]; + + buildInputs = [ + cmake-extras + glib + systemd + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_LOMIRI_FEATURES=OFF" + "-DGSETTINGS_LOCALINSTALL=ON" + "-DGSETTINGS_COMPILE=ON" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Common functions for Ayatana System Indicators"; + homepage = "https://github.com/AyatanaIndicators/libayatana-common"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + pkgConfigModules = [ + "libayatana-common" + ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index c64fd87e6c28..985151494364 100644 --- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -1,41 +1,81 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc -, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted -, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key -, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive -, thin-provisioning-tools, makeWrapper +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk-doc +, docbook_xml_dtd_43 +, python3 +, gobject-introspection +, glib +, udev +, kmod +, parted +, cryptsetup +, lvm2 +, util-linux +, libbytesize +, libndctl +, nss +, volume_key +, libxslt +, docbook_xsl +, gptfdisk +, libyaml +, autoconf-archive +, thin-provisioning-tools +, makeBinaryWrapper +, e2fsprogs +, libnvme +, keyutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "2.28"; + version = "3.0.2"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; - rev = "${version}-1"; - sha256 = "sha256-6MrM3psLqMcpf4haaEHg3FwrhUDz5h/DeY1w96T0UlE="; + rev = "${finalAttrs.version}-1"; + hash = "sha256-tqF96yeBPilF0zQ53RNN7IZ2wVgWQOwbGkvoywN/i+0="; }; outputs = [ "out" "dev" "devdoc" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - sgdisk = "${gptfdisk}/bin/sgdisk"; - }) - ]; - postPatch = '' patchShebangs scripts ''; nativeBuildInputs = [ - autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 - python3 gobject-introspection autoconf-archive makeWrapper + autoconf-archive + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + gtk-doc + libxslt + makeBinaryWrapper + pkg-config + python3 ]; buildInputs = [ - glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid util-linux libbytesize - libndctl nss volume_key libyaml + cryptsetup + e2fsprogs + glib + gptfdisk + keyutils + kmod + libbytesize + libndctl + libnvme + libyaml + lvm2 + nss + parted + udev + util-linux + volume_key ]; postInstall = '' @@ -43,12 +83,12 @@ stdenv.mkDerivation rec { ${lib.makeBinPath [ thin-provisioning-tools ]} ''; - meta = with lib; { + meta = { + changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; description = "A library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; - changelog = "https://github.com/storaged-project/libblockdev/raw/${src.rev}/NEWS.rst"; - license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils - maintainers = with maintainers; [ johnazoidberg ]; - platforms = platforms.linux; + license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils + maintainers = with lib.maintainers; [ johnazoidberg ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch b/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch deleted file mode 100644 index 85822165d8c5..000000000000 --- a/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/src/plugins/part.c -+++ b/src/plugins/part.c -@@ -146,7 +146,7 @@ static GMutex deps_check_lock; - #define DEPS_LAST 2 - - static const UtilDep deps[DEPS_LAST] = { -- {"sgdisk", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, -+ {"@sgdisk@", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, - {"sfdisk", NULL, NULL, NULL}, - }; - -@@ -355,7 +355,7 @@ gboolean bd_part_create_table (const gchar *disk, BDPartTableType type, gboolean - } - - static gchar* get_part_type_guid_and_gpt_flags (const gchar *device, int part_num, guint64 *flags, GError **error) { -- const gchar *args[4] = {"sgdisk", NULL, device, NULL}; -+ const gchar *args[4] = {"@sgdisk@", NULL, device, NULL}; - gchar *output = NULL; - gchar **lines = NULL; - gchar **line_p = NULL; -@@ -1325,7 +1325,7 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size - - - static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag, gboolean state, GError **error) { -- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; -+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; - int bit_num = 0; - gboolean success = FALSE; - -@@ -1351,7 +1351,7 @@ static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag - } - - static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, GError **error) { -- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; -+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; - guint64 real_flags = 0; - gchar *mask_str = NULL; - gboolean success = FALSE; -@@ -1791,7 +1791,7 @@ gboolean bd_part_set_part_name (const gchar *disk, const gchar *part, const gcha - * Tech category: %BD_PART_TECH_GPT-%BD_PART_TECH_MODE_MODIFY_PART - */ - gboolean bd_part_set_part_type (const gchar *disk, const gchar *part, const gchar *type_guid, GError **error) { -- const gchar *args[5] = {"sgdisk", "--typecode", NULL, disk, NULL}; -+ const gchar *args[5] = {"@sgdisk@", "--typecode", NULL, disk, NULL}; - const gchar *part_num_str = NULL; - gboolean success = FALSE; - guint64 progress_id = 0; diff --git a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index 52a3d3112f22..fd5a18f85487 100644 --- a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbytesize"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libbytesize"; rev = finalAttrs.version; - hash = "sha256-/TVv/srhbotIkne0G77hgBF4j+74INqVUr8zlKsaoM0="; + hash = "sha256-4jbu8Hmc4I1IYKiWlCQq7ob98HsgDTqJdghj3ZzOuN8="; }; outputs = [ "out" "dev" "devdoc" "man" ]; @@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { pcre2 ]; + strictDeps = true; + meta = { homepage = "https://github.com/storaged-project/libbytesize"; description = "A tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 3d3fe36b45b5..0c9efaf69f37 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 = "0qn412iv3sl843vwx38c5wc9nwf0sx34a4x78qkdn17wjbrfjj79"; - platforms."x86_64-linux".sha256 = "02vipzdcmq5cvpmra44r82z8y9d53yqpnymsc2mfk98fvkvgz2j9"; + platforms."aarch64-linux".sha256 = "1348821cprfy46fvzipqfy9qmv1jw48dsi2nxnk3k1097c6xb9zq"; + platforms."x86_64-linux".sha256 = "0w58bqys331wssfqrv27v1fbvrgj4hs1kyjanld9vvdlna0x8kpg"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "112.3.0"; - gitRevision = "b09c4ca"; - chromiumVersion = "112.0.5615.165"; + version = "115.3.11"; + gitRevision = "a61da9b"; + chromiumVersion = "115.0.5790.114"; 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/libcifpp/default.nix b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix index 005705846e56..593f69f2da2e 100644 --- a/nixpkgs/pkgs/development/libraries/libcifpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -1,28 +1,53 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, zlib }: +{ lib +, stdenv +, boost +, cmake +, fetchFromGitHub +, fetchpatch +, eigen +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "5.0.8"; + version = "5.1.0.1"; src = fetchFromGitHub { owner = "PDB-REDO"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-KJGcopGhCWSl+ElG3BPJjBf/kvYJowOHxto6Ci1IMco="; + repo = "libcifpp"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fAH7FIgJuitPUoacLnLs8uf9di5iM0c/2WHZqVjJOUE="; }; - nativeBuildInputs = [ cmake ]; + patches = [ + (fetchpatch { + name = "add-include-compare.patch"; + url = "https://github.com/PDB-REDO/libcifpp/commit/676c0c8dc87437e2096718fd8c0750b995e174ba.patch"; + hash = "sha256-fbA4fgiTY93+hFct+BQuHF7uv2nG7D9PljQxq1CkReU="; + }) + ]; - # disable network access - cmakeFlags = [ "-DCIFPP_DOWNLOAD_CCD=OFF" ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ boost zlib ]; + cmakeFlags = [ + # disable network access + "-DCIFPP_DOWNLOAD_CCD=OFF" + ]; + + buildInputs = [ + boost + eigen + zlib + ]; meta = with lib; { description = "Manipulate mmCIF and PDB files"; homepage = "https://github.com/PDB-REDO/libcifpp"; + changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}"; license = licenses.bsd2; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libclc/default.nix b/nixpkgs/pkgs/development/libraries/libclc/default.nix index 1db2819a57b5..9148deeee6f4 100644 --- a/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libclc/default.nix @@ -10,10 +10,14 @@ stdenv.mkDerivation rec { rev = "llvmorg-${version}"; hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; }; - sourceRoot = "source/libclc"; + sourceRoot = "${src.name}/libclc"; outputs = [ "out" "dev" ]; + patches = [ + ./libclc-gnu-install-dirs.patch + ]; + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch postPatch = '' substituteInPlace CMakeLists.txt \ @@ -35,9 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = [ llvm_14 ]; strictDeps = true; - cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; postInstall = '' install -Dt $dev/bin prepare_builtins diff --git a/nixpkgs/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/nixpkgs/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch new file mode 100644 index 000000000000..1e5108a27c38 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch @@ -0,0 +1,10 @@ +--- a/libclc.pc.in ++++ b/libclc.pc.in +@@ -1,5 +1,5 @@ +-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ +-libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libexecdir=@CMAKE_INSTALL_FULL_DATADIR@/clc + + Name: libclc + Description: Library requirements of the OpenCL C programming language diff --git a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix new file mode 100644 index 000000000000..f2c7b1197810 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchFromGitHub +, srcOnly +, cmake +, ninja +, pkg-config +, libnice +, openssl +, plog +, srtp +, usrsctp +}: + +let + # Use usrsctp version specified at https://github.com/paullouisageneau/libdatachannel/tree/master/deps + # Older or newer usrsctp might break libdatachannel, please keep it synced with upstream. + customUsrsctp = usrsctp.overrideAttrs (finalAttrs: previousAttrs: { + version = "unstable-2021-10-08"; + src = fetchFromGitHub { + owner = "sctplab"; + repo = "usrsctp"; + rev = "7c31bd35c79ba67084ce029511193a19ceb97447"; + hash = "sha256-KeOR/0WDtG1rjUndwTUOhE21PoS+ETs1Vk7jQYy/vNs="; + }; + }); +in +stdenv.mkDerivation rec { + pname = "libdatachannel"; + version = "0.18.5"; + + src = fetchFromGitHub { + owner = "paullouisageneau"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ognjEDw68DpdQ/4JqcTejP5f9K0zLZGnpr99P/dvHK4="; + }; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + libnice + openssl + srtp + ]; + + cmakeFlags = [ + "-DUSE_NICE=ON" + "-DUSE_SYSTEM_SRTP=ON" + "-DNO_EXAMPLES=ON" + ]; + + postPatch = '' + # TODO: Remove when updating to 0.19.x, and add + # -DUSE_SYSTEM_USRSCTP=ON and -DUSE_SYSTEM_PLOG=ON to cmakeFlags instead + mkdir -p deps/{usrsctp,plog} + cp -r --no-preserve=mode ${srcOnly customUsrsctp}/. deps/usrsctp + cp -r --no-preserve=mode ${srcOnly plog}/. deps/plog + ''; + + postFixup = '' + # Fix shared library path that will be incorrect on move to "dev" output + substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + ''; + + meta = with lib; { + description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; + homepage = "https://libdatachannel.org/"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ erdnaxe ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/nixpkgs/pkgs/development/libraries/libdatrie/default.nix index 57d30124a6fd..8ea080ef10af 100644 --- a/nixpkgs/pkgs/development/libraries/libdatrie/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatrie/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix index 9efea659a651..5143372d2b0d 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation (finalAttrs: { "3" = gtk3; }.${gtkVersion} or (throw "unknown GTK version ${gtkVersion}"); + patches = [ + ./requires-glib.patch + ]; + postPatch = '' for f in {configure,ltmain.sh,m4/libtool.m4}; do substituteInPlace $f \ diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch b/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch new file mode 100644 index 000000000000..53cad2cf018f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch @@ -0,0 +1,11 @@ +--- a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in ++++ b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in +@@ -5,7 +5,7 @@ + includedir=@includedir@ + + Cflags: -I${includedir}/libdbusmenu-glib-0.4 +-Requires: ++Requires: glib-2.0 + Libs: -L${libdir} -ldbusmenu-glib + + Name: libdbusmenu-glib diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix index 379f5397ec04..9ca5581b3bff 100644 --- a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libdc1394"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz"; - sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; + sha256 = "sha256-U3zreN087ycaGD9KF2GR0c7PhfAlUg5r03WLDhnmYJ8="; }; buildInputs = [ libusb1 ] diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index c7a5a85ae6b6..9c1a10f9f5b1 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -1,13 +1,12 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , callPackage -# for passthru.tests + # for passthru.tests , imagemagick , libheif , imlib2Full @@ -15,29 +14,16 @@ }: stdenv.mkDerivation (finalAttrs: rec { - version = "1.0.11"; + version = "1.0.12"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; - rev = "v${version}"; - sha256 = "sha256-0aRUh5h49fnjBjy42A5fWYHnhnQ4CFoeSIXZilZewW8="; + rev = "refs/tags/v${version}"; + hash = "sha256-pl1r3n4T4FcJ4My/wCE54R2fmTdrlJOvgb2U0MZf1BI="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-27102.patch"; - url = "https://github.com/strukturag/libde265/commit/0b1752abff97cb542941d317a0d18aa50cb199b1.patch"; - sha256 = "sha256-q0NKuk2r5RQT9MJpRO3CTPj6VqYRBnffs9yZ+GM+lNc="; - }) - (fetchpatch { - name = "CVE-2023-27103.patch"; - url = "https://github.com/strukturag/libde265/commit/d6bf73e765b7a23627bfd7a8645c143fd9097995.patch"; - sha256 = "sha256-vxciVzSuVCVDpdz+TKg2tMWp2ArubYji5GLaR9VP4F0="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libdecor/default.nix b/nixpkgs/pkgs/development/libraries/libdecor/default.nix index c3641e843f57..fefaf98c40e9 100644 --- a/nixpkgs/pkgs/development/libraries/libdecor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdecor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "libdecor"; repo = "libdecor"; - rev = "${version}"; + rev = version; hash = "sha256-8b6qCqOSDDbhYwAeAaUyI71tSopTkGtCJaxZaJw1vQQ="; }; diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock index 15900472ae9d..735db14604c5 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -3,12 +3,6 @@ version = 3 [[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - -[[package]] name = "abao" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -23,9 +17,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -38,9 +32,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -53,25 +47,30 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] -name = "aho-corasick" -version = "1.0.1" +name = "ahash" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "memchr", + "cfg-if", + "once_cell", + "version_check", ] [[package]] -name = "aliasable" -version = "0.1.3" +name = "aho-corasick" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] [[package]] name = "alloc-no-stdlib" @@ -89,6 +88,12 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" + +[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -120,9 +125,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anyhow" @@ -135,15 +140,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii_utils" @@ -153,9 +158,9 @@ checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -164,7 +169,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.22", ] [[package]] @@ -216,9 +221,9 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce" +checksum = "da93622739d458dd9a6abc1abf0e38e81965a5824a3b37f9500437c82a8bb572" dependencies = [ "async-channel", "base64 0.21.2", @@ -229,8 +234,8 @@ dependencies = [ "log", "nom", "once_cell", - "ouroboros", "pin-utils", + "self_cell", "stop-token", "thiserror", "tokio", @@ -276,13 +281,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -359,9 +364,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -437,22 +442,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.0.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "blake3" -version = "1.3.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -466,18 +471,18 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "block-padding" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ "generic-array", ] @@ -515,9 +520,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "serde", @@ -535,9 +540,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-pool" @@ -579,9 +584,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -671,9 +676,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -682,15 +687,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -698,9 +703,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", @@ -708,21 +713,20 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.1" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" +checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.1" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" +checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" dependencies = [ "anstyle", - "bitflags 1.3.2", "clap_lex", ] @@ -750,16 +754,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "color_quant" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -767,33 +761,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" [[package]] name = "const_format" -version = "0.2.30" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" +checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.29" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" +checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" dependencies = [ "proc-macro2", "quote", @@ -802,9 +796,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" [[package]] name = "convert_case" @@ -830,15 +824,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -919,9 +913,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -942,9 +936,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -963,9 +957,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -1008,61 +1002,30 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.2" +version = "4.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" +checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" dependencies = [ "cfg-if", - "digest 0.10.6", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", "platforms", + "rustc_version", "subtle", "zeroize", ] [[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.109", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" +name = "curve25519-dalek-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] @@ -1077,12 +1040,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core 0.14.3", - "darling_macro 0.14.3", + "darling_core 0.14.4", + "darling_macro 0.14.4", ] [[package]] @@ -1101,9 +1064,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", @@ -1126,20 +1089,20 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core 0.14.3", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "default-net" @@ -1155,12 +1118,12 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows", + "windows 0.32.0", ] [[package]] name = "deltachat" -version = "1.116.0" +version = "1.118.0" dependencies = [ "ansi_term", "anyhow", @@ -1192,7 +1155,7 @@ dependencies = [ "log", "mailparse", "mime", - "num-derive", + "num-derive 0.4.0", "num-traits", "num_cpus", "once_cell", @@ -1214,7 +1177,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.6", + "sha2 0.10.7", "smallvec", "strum", "strum_macros", @@ -1236,7 +1199,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.116.0" +version = "1.118.0" dependencies = [ "anyhow", "async-channel", @@ -1260,7 +1223,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.116.0" +version = "1.118.0" dependencies = [ "ansi_term", "anyhow", @@ -1275,7 +1238,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.116.0" +version = "1.118.0" dependencies = [ "anyhow", "deltachat", @@ -1295,12 +1258,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] name = "deltachat_ffi" -version = "1.116.0" +version = "1.118.0" dependencies = [ "anyhow", "deltachat", @@ -1330,9 +1293,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.1" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" dependencies = [ "const-oid", "pem-rfc7468 0.7.0", @@ -1341,9 +1304,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs", "displaydoc", @@ -1380,7 +1343,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling 0.14.3", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -1435,11 +1398,11 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "const-oid", "crypto-common", "subtle", @@ -1489,13 +1452,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] @@ -1541,14 +1504,16 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.2" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644d3b8674a5fc5b929ae435bca85c2323d85ccb013a5509c2ac9ee11a6284ba" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" dependencies = [ - "der 0.7.1", - "elliptic-curve 0.13.2", + "der 0.7.7", + "digest 0.10.7", + "elliptic-curve 0.13.5", "rfc6979 0.4.0", - "signature 2.0.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] @@ -1563,12 +1528,12 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be522bee13fa6d8059f4903a4084aa3bd50725e18150202f0238deb615cd6371" +checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" dependencies = [ - "pkcs8 0.10.1", - "signature 2.0.0", + "pkcs8 0.10.2", + "signature 2.1.0", ] [[package]] @@ -1588,22 +1553,22 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0-rc.2" +version = "2.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798f704d128510932661a3489b08e3f4c934a01d61c5def59ae7b8e48f19665a" +checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c" dependencies = [ - "curve25519-dalek 4.0.0-rc.2", - "ed25519 2.2.0", + "curve25519-dalek 4.0.0-rc.3", + "ed25519 2.2.1", "serde", - "sha2 0.10.6", + "sha2 0.10.7", "zeroize", ] [[package]] name = "educe" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4" +checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -1626,7 +1591,7 @@ dependencies = [ "base16ct 0.1.1", "crypto-bigint 0.4.9", "der 0.6.1", - "digest 0.10.6", + "digest 0.10.7", "ff 0.12.1", "generic-array", "group 0.12.1", @@ -1638,21 +1603,21 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.2" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.1", - "digest 0.10.6", + "crypto-bigint 0.5.2", + "digest 0.10.7", "ff 0.13.0", "generic-array", "group 0.13.0", "hkdf", "pem-rfc7468 0.7.0", - "pkcs8 0.10.1", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.1", + "sec1 0.7.2", "subtle", "zeroize", ] @@ -1785,16 +1750,15 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.12" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" +checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "rustc_version", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] @@ -1811,14 +1775,20 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1901,13 +1871,22 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.11" +version = "3.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9799aefb4a2e4a01cc47610b1dd47c18ab13d991f27bbcaed9296f5a53d5cbad" +checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.2", + "windows-sys 0.48.0", +] + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", ] [[package]] @@ -1932,27 +1911,27 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ace6ec7cc19c8ed33a32eaa9ea692d7faea05006b5356b9e2b668ec4bc3955" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", "redox_syscall 0.2.16", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -1994,9 +1973,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2076,7 +2055,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -2111,9 +2090,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -2133,9 +2112,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -2156,9 +2135,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "group" @@ -2184,9 +2163,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -2194,7 +2173,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -2213,16 +2192,26 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown", + "hashbrown 0.14.0", ] [[package]] @@ -2233,18 +2222,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -2267,7 +2247,16 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", ] [[package]] @@ -2317,9 +2306,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "human-panic" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16465f6227e18e5a64eba488245d7b2974d4db0c4404ca5a69b550defa18d0a" +checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" dependencies = [ "backtrace", "os_info", @@ -2335,7 +2324,7 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" dependencies = [ - "libm 0.2.6", + "libm", ] [[package]] @@ -2346,9 +2335,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -2361,7 +2350,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -2383,26 +2372,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.48.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -2433,9 +2421,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2468,12 +2456,22 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -2496,31 +2494,32 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipconfig" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.3", "widestring", - "winapi", - "winreg", + "windows-sys 0.48.0", + "winreg 0.50.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "iroh" @@ -2568,14 +2567,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", + "hermit-abi", + "rustix 0.38.2", + "windows-sys 0.48.0", ] [[package]] @@ -2589,9 +2587,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "jpeg-decoder" @@ -2601,9 +2599,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2619,9 +2617,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -2661,21 +2659,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.145" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" -version = "0.1.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" @@ -2690,15 +2682,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2706,15 +2689,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2722,9 +2711,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lru-cache" @@ -2779,7 +2768,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2796,9 +2785,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -2817,23 +2806,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2848,7 +2837,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -2951,9 +2940,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] @@ -2981,13 +2970,13 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ "byteorder", "lazy_static", - "libm 0.2.6", + "libm", "num-integer", "num-iter", "num-traits", @@ -3009,6 +2998,17 @@ dependencies = [ ] [[package]] +name = "num-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3047,24 +3047,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm 0.2.6", + "libm", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -3098,9 +3098,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -3113,13 +3113,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] @@ -3130,20 +3130,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.1+1.1.1t" +version = "111.26.0+1.1.1u" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -3159,9 +3158,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_info" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", @@ -3169,29 +3168,6 @@ dependencies = [ ] [[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", -] - -[[package]] -name = "ouroboros_macro" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "output_vt100" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3214,19 +3190,19 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] name = "p256" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.2", - "elliptic-curve 0.13.2", + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", "primeorder", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] @@ -3237,7 +3213,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] @@ -3246,27 +3222,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ - "ecdsa 0.16.2", - "elliptic-curve 0.13.2", + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", "primeorder", - "sha2 0.10.6", -] - -[[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" -dependencies = [ - "cfg-if", - "libm 0.1.4", + "sha2 0.10.7", ] [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -3280,22 +3246,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.1", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pem" @@ -3352,9 +3318,9 @@ dependencies = [ "crc24", "derive_builder", "des", - "digest 0.10.6", - "ed25519-dalek 2.0.0-rc.2", - "elliptic-curve 0.13.2", + "digest 0.10.7", + "ed25519-dalek 2.0.0-rc.3", + "elliptic-curve 0.13.5", "flate2", "generic-array", "hex", @@ -3363,17 +3329,17 @@ dependencies = [ "md-5", "nom", "num-bigint-dig", - "num-derive", + "num-derive 0.3.3", "num-traits", - "p256 0.13.0", + "p256 0.13.2", "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.0-pre.0", + "rsa 0.9.0-pre.2", "sha1", - "sha2 0.10.6", + "sha2 0.10.7", "sha3", - "signature 2.0.0", + "signature 2.1.0", "smallvec", "thiserror", "twofish", @@ -3383,29 +3349,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -3427,14 +3393,13 @@ dependencies = [ [[package]] name = "pkcs1" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "178ba28ece1961eafdff1991bd1744c29564cbab5d803f3ccb4a4895a6c550a7" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.1", - "pkcs8 0.10.1", - "spki 0.7.0", - "zeroize", + "der 0.7.7", + "pkcs8 0.10.2", + "spki 0.7.2", ] [[package]] @@ -3449,19 +3414,19 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.1", - "spki 0.7.0", + "der 0.7.7", + "spki 0.7.2", ] [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" @@ -3471,9 +3436,9 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -3484,36 +3449,37 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "png" -version = "0.17.7" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] [[package]] name = "portable-atomic" -version = "1.0.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c00c8683a03bd4fe7db7dd64ab4abee6b42166bc81231da983486ce96be51a" +checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" [[package]] name = "postcard" @@ -3568,11 +3534,11 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" dependencies = [ - "elliptic-curve 0.13.2", + "elliptic-curve 0.13.5", ] [[package]] @@ -3601,9 +3567,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -3657,9 +3623,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" dependencies = [ "memchr", ] @@ -3707,25 +3673,25 @@ source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd dependencies = [ "libc", "quinn-proto", - "socket2", + "socket2 0.4.9", "tracing", "windows-sys 0.45.0", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] [[package]] name = "quoted_printable" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24039f627d8285853cc90dcddf8c1ebfaa91f834566948872b225b9a28ed1b6" +checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" [[package]] name = "radix_trie" @@ -3796,7 +3762,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -3823,9 +3789,9 @@ version = "1.0.0" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -3833,9 +3799,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3851,7 +3817,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.20", + "time 0.3.22", "yasna", ] @@ -3879,16 +3845,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -3950,7 +3916,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -4005,7 +3971,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -4015,7 +3981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" dependencies = [ "byteorder", - "digest 0.10.6", + "digest 0.10.7", "num-bigint-dig", "num-integer", "num-iter", @@ -4031,20 +3997,21 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.0-pre.0" +version = "0.9.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bc1d34159d63536b4d89944e9ab5bb952f45db6fa0b8b03c2f8c09fb5b7171" +checksum = "65db0998ad35adcaca498b7358992e088ee16cc783fe6fb899da203e113a63e5" dependencies = [ "byteorder", - "digest 0.10.6", + "const-oid", + "digest 0.10.7", "num-bigint-dig", "num-integer", "num-iter", "num-traits", - "pkcs1 0.7.1", - "pkcs8 0.10.1", + "pkcs1 0.7.5", + "pkcs8 0.10.2", "rand_core 0.6.4", - "signature 2.0.0", + "signature 2.1.0", "subtle", "zeroize", ] @@ -4055,7 +4022,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.0.2", + "bitflags 2.3.3", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4071,9 +4038,9 @@ checksum = "efe2374f2385cdd8755a446f80b2a646de603c9d8539ca38734879b5c71e378b" [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -4101,16 +4068,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.6" +version = "0.37.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.45.0", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys 0.48.0", ] [[package]] @@ -4126,9 +4106,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -4138,30 +4118,30 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "rustyline" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" +checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cfg-if", "clipboard-win", - "dirs-next", "fd-lock", + "home", "libc", "log", "memchr", @@ -4176,9 +4156,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "safemem" @@ -4207,11 +4187,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -4245,12 +4225,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - -[[package]] name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4276,23 +4250,23 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" dependencies = [ "base16ct 0.2.0", - "der 0.7.1", + "der 0.7.7", "generic-array", - "pkcs8 0.10.1", + "pkcs8 0.10.2", "subtle", "zeroize", ] [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4303,28 +4277,34 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", ] [[package]] +name = "self_cell" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" + +[[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" dependencies = [ "serde_derive", ] @@ -4340,22 +4320,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -4371,9 +4351,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -4382,18 +4362,19 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55" dependencies = [ + "itoa", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -4418,7 +4399,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -4429,7 +4410,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -4447,22 +4428,22 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -4490,21 +4471,27 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] [[package]] name = "signature" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] [[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + +[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4536,6 +4523,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4562,12 +4559,12 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.1", + "der 0.7.7", ] [[package]] @@ -4578,7 +4575,7 @@ checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1" dependencies = [ "base64ct", "pem-rfc7468 0.6.0", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] @@ -4593,7 +4590,7 @@ dependencies = [ "rand_core 0.6.4", "rsa 0.7.2", "sec1 0.3.0", - "sha2 0.10.6", + "sha2 0.10.7", "signature 1.6.4", "ssh-encoding", "zeroize", @@ -4637,28 +4634,28 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -4673,9 +4670,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -4716,9 +4713,9 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4743,15 +4740,16 @@ checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.37.22", + "windows-sys 0.48.0", ] [[package]] @@ -4765,9 +4763,9 @@ dependencies = [ [[package]] name = "testdir" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45fc921e7c4ad1aedb3484811514f3e5cd187886e0bbf1302c175f7578ef552" +checksum = "48b7965698cfb3d1ac1e6e54b4b45f5caa9e89bda223c8cf723d9cf53d7cefa7" dependencies = [ "anyhow", "backtrace", @@ -4790,22 +4788,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -4831,9 +4829,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" dependencies = [ "itoa", "serde", @@ -4843,15 +4841,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -4883,11 +4881,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -4895,7 +4894,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.4.9", "tokio-macros", "windows-sys 0.48.0", ] @@ -4918,7 +4917,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -5000,9 +4999,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" dependencies = [ "serde", "serde_spanned", @@ -5012,20 +5011,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -5075,20 +5074,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -5117,9 +5116,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -5250,15 +5249,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-linebreak" @@ -5266,7 +5265,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "regex", ] @@ -5305,12 +5304,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] @@ -5322,17 +5321,17 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "serde", ] @@ -5372,11 +5371,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -5400,9 +5398,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5410,24 +5408,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -5437,9 +5435,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5447,28 +5445,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5492,9 +5490,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "whoami" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" dependencies = [ "wasm-bindgen", "web-sys", @@ -5502,9 +5500,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -5551,18 +5549,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows-targets 0.48.1", ] [[package]] @@ -5580,7 +5572,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -5589,20 +5581,20 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -5615,9 +5607,9 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -5633,9 +5625,9 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -5651,9 +5643,9 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -5669,9 +5661,9 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -5687,9 +5679,9 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -5699,9 +5691,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -5717,9 +5709,9 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -5729,9 +5721,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" dependencies = [ "memchr", ] @@ -5746,6 +5738,16 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "x25519-dalek" version = "2.0.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5771,7 +5773,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.22", ] [[package]] @@ -5791,11 +5793,11 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.20", + "time 0.3.22", ] [[package]] @@ -5828,7 +5830,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94" dependencies = [ "convert_case 0.5.0", - "darling 0.14.3", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -5836,21 +5838,20 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.23", ] diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 097624ddcdeb..562f45048aab 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.116.0"; + version = "1.118.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-fSTte2rqy0w4zk9Vh4y3/UWplR0hvwdBqSoSYjoUhPg="; + hash = "sha256-1vkmz7LFG420zYETYIf3ayOQEPp+hz7Dr7gULz1nJOs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix index 4a9a4b0980e3..8e37bd773cb3 100644 --- a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdivecomputer"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-gNnxlOokUCA535hZhILgr8aw4zPeeds0wpstaJNNJbk="; + sha256 = "sha256-J17M55I2RO1YH6q53LTxpprSUbzrByHE5fhftjFheg4="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix b/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix index 8f8354ae8587..ba1b3c05f1a6 100644 --- a/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libdmapsharing"; - version = "3.9.12"; + version = "3.9.13"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4="; + sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libe-book/default.nix b/nixpkgs/pkgs/development/libraries/libe-book/default.nix index 095fb0ff79d0..f066e470568b 100644 --- a/nixpkgs/pkgs/development/libraries/libe-book/default.nix +++ b/nixpkgs/pkgs/development/libraries/libe-book/default.nix @@ -15,11 +15,20 @@ stdenv.mkDerivation rec { pname = "libe-book"; version = "0.1.3"; + src = fetchurl { - url = "https://kent.dl.sourceforge.net/project/libebook/libe-book-${version}/libe-book-${version}.tar.xz"; - sha256 = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk="; + url = "mirror://sourceforge/libebook/libe-book-${version}/libe-book-${version}.tar.xz"; + hash = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk="; }; + + # restore compatibility with icu68+ + postPatch = '' + substituteInPlace src/lib/EBOOKCharsetConverter.cpp --replace \ + "TRUE, TRUE, &status)" \ + "true, true, &status)" + ''; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gperf librevenge @@ -30,12 +39,9 @@ stdenv.mkDerivation rec { zlib liblangtag ]; - # Boost 1.59 compatibility fix - # Attempt removing when updating - postPatch = '' - sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in - ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; + meta = with lib; { description = "Library for import of reflowable e-book formats"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix index bec3bba51e6e..7be484538ab1 100644 --- a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix @@ -1,45 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, strace, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch2 +, autoreconfHook +, strace +, which +}: stdenv.mkDerivation rec { pname = "libeatmydata"; - version = "105"; + version = "131"; src = fetchFromGitHub { owner = "stewartsmith"; repo = pname; - rev = "${pname}-${version}"; - sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; }; patches = [ - ./find-shell-lib.patch - # Fixes "error: redefinition of 'open'" on musl - (fetchpatch { + (fetchpatch2 { url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; - stripLen = 1; - sha256 = "sha256-yfMfISbYL7r/R2C9hYPjvGcpUB553QSiW0rMrxG11Oo="; + hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM="; }) ]; - patchFlags = [ "-p0" ]; - postPatch = '' - substituteInPlace eatmydata.in \ - --replace NIX_OUT_DIR $out - patchShebangs . ''; nativeBuildInputs = [ autoreconfHook - ] ++ lib.optionals doCheck [ strace which ]; + ]; + + nativeCheckInputs = [ + strace + which + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - # while we can *build* in parallel, the tests also run in parallel which does - # not work with v105. Later versions (unreleased) have a fix for that. The - # problem is that on hydra we cannot use strace, so the tests don't run there. enableParallelBuilding = true; - doCheck = false; meta = with lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch b/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch deleted file mode 100644 index a6320edda29d..000000000000 --- a/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- eatmydata.in 2020-02-01 18:10:59.618679823 -0800 -+++ eatmydata.in.new 2020-02-01 18:08:25.092620247 -0800 -@@ -15,15 +15,8 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu.org/licenses/>. - --export `dpkg-architecture|grep DEB_BUILD_MULTIARCH` -- --shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh" --if [ -f "$shlib" ]; then -- . "$shlib" --else -- echo "Unable to locate eatmydata shell library, it was not enabled" >&2 -- exec "$@" --fi -+shlib="NIX_OUT_DIR/libexec/eatmydata.sh" -+. "$shlib" - - usage() - { diff --git a/nixpkgs/pkgs/development/libraries/libei/default.nix b/nixpkgs/pkgs/development/libraries/libei/default.nix index 0aa4cc544a5d..4aa512e3eabd 100644 --- a/nixpkgs/pkgs/development/libraries/libei/default.nix +++ b/nixpkgs/pkgs/development/libraries/libei/default.nix @@ -24,14 +24,14 @@ let in stdenv.mkDerivation rec { pname = "libei"; - version = "0.99.2"; + version = "1.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = version; - hash = "sha256-hxWWOvqenHHnzrvRwSwNT1GFVx9NR+Mm1XK9nisF8fA="; + hash = "sha256-Xt4mhZMAohdQWsqfZCaP3+Tsauxv3GhlceiqgxdfNWo="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libelf/default.nix b/nixpkgs/pkgs/development/libraries/libelf/default.nix index 3302d127d4d3..0a1a7175296e 100644 --- a/nixpkgs/pkgs/development/libraries/libelf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libelf/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # Fix warnings from preprocessor instructions. # https://github.com/NixOS/nixpkgs/issues/59929 ./preprocessor-warnings.patch + # `configure` defines a test `main` with an implicit `int` return, which clang 16 disallows. + ./fix-configure-main.patch ]; enableParallelBuilding = true; @@ -55,7 +57,13 @@ stdenv.mkDerivation rec { # cross-compiling, but `autoreconfHook` brings in `makeWrapper` which # doesn't work with the bootstrapTools bash, so can only do this for # cross builds when `stdenv.shell` is a newer bash. - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform + # The provided `configure` script fails on clang 16 because some tests have a `main` + # returning an implicit `int`, which clang 16 treats as an error. Running `autoreconf` fixes + # the test and allows `configure` to detect clang properly. + # This is done only for clang on Darwin because the Darwin stdenv bootstrap does not use + # libelf, so should be safe because it will always be run with a compatible version of bash. + || (stdenv.cc.isClang && stdenv.isDarwin)) autoreconfHook; meta = { description = "ELF object file access library"; diff --git a/nixpkgs/pkgs/development/libraries/libelf/fix-configure-main.patch b/nixpkgs/pkgs/development/libraries/libelf/fix-configure-main.patch new file mode 100644 index 000000000000..cc7e5f4c41d1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libelf/fix-configure-main.patch @@ -0,0 +1,12 @@ +diff -ur a/configure.in b/configure.in +--- a/configure.in 2008-05-23 04:17:56.000000000 -0400 ++++ b/configure.in 2023-06-01 19:16:04.801921924 -0400 +@@ -282,7 +282,7 @@ + #define memmove(d,s,n) bcopy((s),(d),(n)) + #endif + extern int strcmp(); +-main() { ++int main() { + char buf[] = "0123456789"; + memmove(buf + 1, buf, 9); + if (strcmp(buf, "0012345678")) exit(1); diff --git a/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/nixpkgs/pkgs/development/libraries/libepoxy/default.nix index 3eb1d47c98d1..1636d6cd6c65 100644 --- a/nixpkgs/pkgs/development/libraries/libepoxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libepoxy/default.nix @@ -13,10 +13,6 @@ , x11Support ? !stdenv.isDarwin }: -let - inherit (lib) getLib optional optionalString; - -in stdenv.mkDerivation rec { pname = "libepoxy"; version = "1.5.10"; @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs src/*.py '' - + optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; @@ -41,8 +37,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = lib.optionals x11Support [ + buildInputs = lib.optionals (x11Support && !stdenv.isDarwin) [ libGL + ] ++ lib.optionals x11Support [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Carbon @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { "-Dx11=${lib.boolToString x11Support}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) preCheck = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index bd5edec68a06..782d86f1f581 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = lib.optional (!sslSupport) "--disable-openssl"; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/nixpkgs/pkgs/development/libraries/libfabric/default.nix index f6fa8b2c59c6..b0d8a3a0081b 100644 --- a/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.18.0"; + version = "1.18.1"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-30ADIUbpzwyxMJtPyLDwXYGJF4c1ZiSJH2mBBtgfE18="; + sha256 = "sha256-3iQsFfpXSyMFkBeByGJmKSTUXuLsWA0l8t1cCDkNRos="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libffi/3.3.nix b/nixpkgs/pkgs/development/libraries/libffi/3.3.nix index b6837c6523f7..294717d1fb1c 100644 --- a/nixpkgs/pkgs/development/libraries/libffi/3.3.nix +++ b/nixpkgs/pkgs/development/libraries/libffi/3.3.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { "--disable-exec-static-tramp" ]; + # with fortify3, tests fail for some reason + hardeningDisable = [ "fortify3" ]; + preCheck = '' # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE. NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} diff --git a/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/nixpkgs/pkgs/development/libraries/libfido2/default.nix index 6904177567b1..c14c30c27335 100644 --- a/nixpkgs/pkgs/development/libraries/libfido2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfido2/default.nix @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { "-DUSE_PCSC=1" ]; + # causes possible redefinition of _FORTIFY_SOURCE? + hardeningDisable = [ "fortify3" ]; + meta = with lib; { description = '' Provides library functionality for FIDO 2.0, including communication with a device over USB. diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 67b49b55c7d7..3eb9fad6336f 100644 --- a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ gettext gnutls nettle libxcrypt ] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' + export MACOSX_DEPLOYMENT_TARGET=10.13 # for futimens() + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix index 37eaed3ac650..d789aafbcb4e 100644 --- a/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , wrapQtAppsHook , fetchFromGitHub , cmake @@ -9,28 +9,32 @@ , zlib , libpng , boost -, guile_3_0 -, stdenv +, guile +, qtbase +, darwin }: -mkDerivation { - pname = "libfive-unstable"; - version = "2022-05-19"; +stdenv.mkDerivation { + pname = "libfive"; + version = "unstable-2023-06-07"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "d83cc22709ff1f7c478be07ff2419e30e024834e"; - sha256 = "lNJg2LCpFcTewSA00s7omUtzhVxycAXvo6wEM/JjrN0="; + rev = "c85ffe1ba1570c2551434c5bad731884aaf80598"; + hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc="; }; nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; - buildInputs = [ eigen zlib libpng boost guile_3_0 ]; + buildInputs = [ eigen zlib libpng boost guile qtbase ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' substituteInPlace studio/src/guile/interpreter.cpp \ - --replace "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile\");" \ - "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/lib/guile/3.0/ccache\");" + --replace '"libfive/bind/guile"' \ + '"libfive/bind/guile:${placeholder "out"}/${guile.siteCcacheDir}"' \ + --replace '(app_resource_dir + ":" + finder_build_dir).toLocal8Bit()' \ + '"libfive/bind/guile:${placeholder "out"}/${guile.siteCcacheDir}"' substituteInPlace libfive/bind/guile/CMakeLists.txt \ --replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \ @@ -42,19 +46,21 @@ mkDerivation { ''; cmakeFlags = [ - "-DGUILE_CCACHE_DIR=${placeholder "out"}/lib/guile/3.0/ccache" + "-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}" + ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + # warning: 'aligned_alloc' is only available on macOS 10.15 or newer + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" ]; - postInstall = if stdenv.isDarwin then '' + postInstall = lib.optionalString stdenv.isDarwin '' # No rules to install the mac app, so do it manually. mkdir -p $out/Applications cp -r studio/Studio.app $out/Applications/Studio.app - install_name_tool \ - -change libfive.dylib $out/lib/libfive.dylib \ - -change libfive-guile.dylib $out/lib/libfive-guile.dylib \ - $out/Applications/Studio.app/Contents/MacOS/Studio - '' else '' + install_name_tool -add_rpath $out/lib $out/Applications/Studio.app/Contents/MacOS/Studio + + makeWrapper $out/Applications/Studio.app/Contents/MacOS/Studio $out/bin/Studio + '' + '' # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; @@ -64,6 +70,6 @@ mkDerivation { homepage = "https://libfive.com/"; maintainers = with maintainers; [ hodapp kovirobi ]; license = with licenses; [ mpl20 gpl2Plus ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index 0a7f9be4f729..32ff8a1e216f 100644 --- a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.33"; + version = "1.1.34"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-tVvW7cbgj2t251SzUchfVEnHgLVgdkTLyGpQfn6VYow="; + sha256 = "sha256-e4J7K1AZyw3AvBNMj69VGKo7gtJ6Nr2ELjqgoqPlObU="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch b/nixpkgs/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch new file mode 100644 index 000000000000..b636f07e2bd6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index e47a3f1..f529e69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,10 +16,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AC_C_BIGENDIAN + +-AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +-if test "x$PKG_CONFIG" = "xno"; then +- AC_MSG_ERROR([You need to install pkg-config]) +-fi ++PKG_PROG_PKG_CONFIG ++ + GLIB_REQUIRED_VERSION="2.2.3" + PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) + diff --git a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix index 705205df396c..e71aedd2cbcf 100644 --- a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix @@ -1,18 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig +{ lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgdiplus"; - version = "6.0.5"; + version = "6.1"; - src = fetchFromGitHub { - owner = "mono"; - repo = "libgdiplus"; - rev = version; - sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c"; + # Using source archive to avoid fetching Git submodules. + # Git repo: https://github.com/mono/libgdiplus + src = fetchzip { + url = "https://download.mono-project.com/sources/libgdiplus/libgdiplus-${finalAttrs.version}.tar.gz"; + hash = "sha256-+lP9ETlw3s0RUliQT1uBWZ2j6o3V9EECBQSppOYFq4Q="; }; + patches = [ + # Fix pkg-config lookup when cross-compiling. + ./configure-pkg-config.patch + ]; + NIX_LDFLAGS = "-lgif"; outputs = [ "out" "dev" ]; @@ -45,4 +50,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.mit; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix index 628f4dca8c56..6b5e395efba6 100644 --- a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - sourceRoot = "source/libgeotiff"; + sourceRoot = "${src.name}/libgeotiff"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" diff --git a/nixpkgs/pkgs/development/libraries/libgepub/default.nix b/nixpkgs/pkgs/development/libraries/libgepub/default.nix index 1c5d43af12e0..fbf9d28ce93e 100644 --- a/nixpkgs/pkgs/development/libraries/libgepub/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgepub/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libgepub"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IQpMeJXC6E8BpWglArpej6PqiWrzFw+yWS/OHdpW4C4="; + sha256 = "o+SzGiMmWdJqVLkSGziCw9c5fDz0SuXGS4ZwCYC8f2A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index 29543cae2e12..6cba6bcf8a16 100644 --- a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.69"; + version = "1.0.71"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-+4aAujSmdrcRMnTd6wHHbyQBfC1LRskZ+8MA2d3hDnI="; + sha256 = "sha256-I58XN1Ku5VVmxuTZ6yPm8jWGKscwLOhetWC+6B6EZRE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch deleted file mode 100644 index f2ee8e8d3d73..000000000000 --- a/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 -From: Johannes Lode <johannes.lode@dynainstruments.com> -Date: Thu, 14 Nov 2019 10:44:00 +0100 -Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as - regular functions. - -While cross-compiling there occurred "undefined reference to -`rpl_malloc'", the suggested change fixes the problem. - -Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 008499d..b492dc4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], - - # This is always checked (library needs this) - AC_HEADER_STDC --AC_FUNC_MALLOC -+# AC_FUNC_MALLOC -- does not work while cross-compiling -+AC_CHECK_FUNC([malloc realloc]) - AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) - AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) - AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) --- -2.25.1 - diff --git a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index ce5a4ac2833d..6a6e21662ecc 100644 --- a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -1,23 +1,15 @@ -{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod -, enable-tools ? true -, enablePython ? false, python3, ncurses }: +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config +, enable-tools ? true }: stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.6.4"; + version = "2.0.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; + hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk="; }; - patches = [ - # cross compiling fix - # https://github.com/brgl/libgpiod/pull/45 - ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch - ]; - - buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive pkg-config @@ -27,8 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-bindings-cxx" - "--prefix=${placeholder "out"}" - ] ++ lib.optional enablePython "--enable-bindings-python"; + ]; meta = with lib; { description = "C library and tools for interacting with the linux GPIO character device"; @@ -38,7 +29,10 @@ stdenv.mkDerivation rec { data structures behind a straightforward API. ''; homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; - license = licenses.lgpl2; + license = with licenses; [ + lgpl21Plus # libgpiod + lgpl3Plus # C++ bindings + ] ++ lib.optional enable-tools gpl2Plus; maintainers = [ maintainers.expipiplus1 ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix index 590aaf27c5f0..a34b108a0a5a 100644 --- a/nixpkgs/pkgs/development/libraries/libgpod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , perlPackages , intltool , autoreconfHook @@ -24,11 +25,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gtkpod/libgpod-${version}.tar.bz2"; - sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3"; + hash = "sha256-Y4p5WdBOlfHmKrrQK9M3AuTo3++YSFrH2dUDlcN+lV0="; }; outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "libplist-2.3.0-compatibility.patch"; + url = "https://sourceforge.net/p/gtkpod/patches/48/attachment/libplist-2.3.0-compatibility.patch"; + hash = "sha256-aVkuYE1N/jdEhVhiXEVhApvOC+8csIMMpP20rAJwEVQ="; + }) + ]; + postPatch = '' # support libplist 2.2 substituteInPlace configure.ac --replace 'libplist >= 1.0' 'libplist-2.0 >= 2.2' diff --git a/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 59df64e63558..5098bd9f65ca 100644 --- a/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , pkg-config , meson @@ -9,42 +10,23 @@ , vala , gobject-introspection , fetchpatch +, glibcLocales +, umockdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgudev"; - version = "237"; + version = "238"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; + url = "mirror://gnome/sources/libgudev/${lib.versions.majorMinor finalAttrs.version}/libgudev-${finalAttrs.version}.tar.xz"; + hash = "sha256-YSZqsa/J1z28YKiyr3PpnS/f9H2ZVE0IV2Dk+mZ7XdE="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27 - (fetchpatch { - name = "gir-dep"; - url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/6bdde16a0cfde462502fce1d9a7eb6ec33f388bb.diff"; - sha256 = "sha256-bDtLUxOLEgyJURshqEQC4YCBTUVzQQP4qoWL786b3Z8="; - }) - (fetchpatch { - name = "vapi-dep"; - url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/d1f6457910842ba869c9871e7a2131fbe0d6b6be.diff"; - sha256 = "sha256-/PY8ziZST/vQvksJm69a3O6/YesknIxCDvj0z40piik="; - }) - (fetchpatch { - name = "gtk-doc-dep"; - url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/34336cbadbcaac8b9b029f730eed0bdf4c633617.diff"; - sha256 = "sha256-Bk05xe69LGqWH1uhLMZhwbVMSsCTyBrrOvqWic2TTd4="; - }) - ]; - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson @@ -59,14 +41,17 @@ stdenv.mkDerivation rec { glib ]; - mesonFlags = [ - # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway - "-Dtests=disabled" + checkInputs = [ + glibcLocales + umockdev ]; + doCheck = true; + mesonFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-Dtests=disabled"; + passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgudev"; versionPolicy = "none"; }; }; @@ -78,4 +63,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl2Plus; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index 745b1a180008..0b2b4278a65a 100644 --- a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -38,17 +38,18 @@ , appliance ? null , javaSupport ? false , jdk +, zstd }: assert appliance == null || lib.isDerivation appliance; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.48.4"; + version = "1.50.1"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI="; + sha256 = "sha256-Xmhx6I+C5SHjHUQt5qELZJcCN8t5VumdEXsSO1hWWm8="; }; strictDeps = true; @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config qemu + zstd ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/nixpkgs/pkgs/development/libraries/libhsts/default.nix index df53e7d294f2..2150bbd24bfb 100644 --- a/nixpkgs/pkgs/development/libraries/libhsts/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhsts/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Library to easily check a domain against the Chromium HSTS Preload list"; homepage = "https://gitlab.com/rockdaboot/libhsts"; license = with licenses; [ mit bsd3 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix index a6481970ef27..91b0df75f87b 100644 --- a/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, lib , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic +, enableDarwinABICompat ? false }: # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross @@ -28,8 +29,35 @@ stdenv.mkDerivation rec { '' + lib.optionalString (!enableShared) '' sed -i -e '/preload/d' Makefile.in + '' + # The system libiconv is based on libiconv 1.11 with some ABI differences. The following changes + # build a compatible libiconv on Darwin, allowing it to be sustituted in place of the system one + # using `install_name_tool`. This removes the need to for a separate, Darwin-specific libiconv + # derivation and allows Darwin to benefit from upstream updates and fixes. + + lib.optionalString enableDarwinABICompat '' + for iconv_h_in in iconv.h.in iconv.h.build.in; do + substituteInPlace "include/$iconv_h_in" \ + --replace "#define iconv libiconv" "" \ + --replace "#define iconv_close libiconv_close" "" \ + --replace "#define iconv_open libiconv_open" "" \ + --replace "#define iconv_open_into libiconv_open_into" "" \ + --replace "#define iconvctl libiconvctl" "" \ + --replace "#define iconvlist libiconvlist" "" + done ''; + # This is hacky, but `libiconv.dylib` needs to reexport `libcharset.dylib` to match the behavior + # of the system libiconv on Darwin. Trying to do this by modifying the `Makefile` results in an + # error linking `iconv` because `libcharset.dylib` is not at its final path yet. Avoid the error + # by building without the reexport then clean and rebuild `libiconv.dylib` with the reexport. + # + # For an explanation why `libcharset.dylib` is reexported, see: + # https://github.com/apple-oss-distributions/libiconv/blob/a167071feb7a83a01b27ec8d238590c14eb6faff/xcodeconfig/libiconv.xcconfig + postBuild = lib.optionalString enableDarwinABICompat '' + make clean -C lib + NIX_CFLAGS_COMPILE+=" -Wl,-reexport-lcharset -L. " make -C lib -j$NIX_BUILD_CORES SHELL=$SHELL + ''; + configureFlags = [ (lib.enableFeature enableStatic "static") (lib.enableFeature enableShared "shared") diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix index 21daddb7ba3d..5c602a4ee9aa 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice-glue/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { pname = "libimobiledevice-glue"; - version = "0.pre+date=2022-05-22"; + version = "1.0.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb"; - hash = "sha256-BAdpJK6/iUKCNYLaCJQo0VK63AdIafO8wGbNhnvEc/o="; + rev = version; + hash = "sha256-9TjIYz6w61JaJgOJtWteIDk9bO3NnXp/2ZJwdirFcYM="; }; nativeBuildInputs = [ @@ -28,9 +28,13 @@ stdenv.mkDerivation rec { libplist ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice-glue"; - description = "Library with common code used by the libraries and tools around the libimobiledevice project."; + description = "Library with common code used by the libraries and tools around the libimobiledevice project"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 8ded220678d0..000649100313 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, gnutls +, openssl , libgcrypt , libplist , libtasn1 @@ -15,28 +15,24 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "1.3.0+date=2022-05-22"; + version = "1.3.0+date=2023-04-30"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "12394bc7be588be83c352d7441102072a89dd193"; - hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM="; + rev = "860ffb707af3af94467d2ece4ad258dda957c6cd"; + hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ - gnutls + openssl libgcrypt libplist libtasn1 @@ -47,7 +43,11 @@ stdenv.mkDerivation rec { CoreFoundation ]; - configureFlags = [ "--with-gnutls" "--without-cython" ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + + configureFlags = [ "--without-cython" ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; diff --git a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix index 1de958dfb3a5..c2a8e16e1d48 100644 --- a/nixpkgs/pkgs/development/libraries/libirecovery/default.nix +++ b/nixpkgs/pkgs/development/libraries/libirecovery/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { pname = "libirecovery"; - version = "1.0.0+date=2022-04-04"; + version = "1.1.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "82d235703044c5af9da8ad8f77351fd2046dac47"; - hash = "sha256-OESN9qme+TlSt+ZMbR4F3z/3RN0I12R7fcSyURBqUVk="; + rev = version; + hash = "sha256-84xwSOLwPU2Py6X2r6FYESxdc1EuuD6xHEXTUUEdvTE="; }; nativeBuildInputs = [ @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { libimobiledevice-glue ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + # Packager note: Not clear whether this needs a NixOS configuration, # as only the `idevicerestore` binary was tested so far (which worked # without further configuration). diff --git a/nixpkgs/pkgs/development/libraries/libisofs/default.nix b/nixpkgs/pkgs/development/libraries/libisofs/default.nix index d80614609c38..a9db714a5bbc 100644 --- a/nixpkgs/pkgs/development/libraries/libisofs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisofs/default.nix @@ -1,22 +1,32 @@ -{ lib, stdenv, fetchurl, acl, attr, zlib }: +{ lib, stdenv, fetchurl, acl, attr, libiconv, zlib }: stdenv.mkDerivation rec { pname = "libisofs"; - version = "1.5.4"; + version = "1.5.6.pl01"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-qqDtgKdQGXkxb1BbCwF/Kcug6lRjt1EUO60sNgIVqI4="; + hash = "sha256-rB/TONZBdEyh+xVnkXGIt5vIwlBoMt1WiF/smGVrnyU="; }; - buildInputs = [ attr zlib ]; - propagatedBuildInputs = [ acl ]; + buildInputs = lib.optionals stdenv.isLinux [ + acl + attr + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ] ++ [ + zlib + ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/nixpkgs/pkgs/development/libraries/libjwt/default.nix index 3f9632bbe03d..4d2c11601135 100644 --- a/nixpkgs/pkgs/development/libraries/libjwt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-as4tqvRY559Q2R3s4GZHovqsCboXNz/NcV5lo+qCeOk="; + sha256 = "sha256-5hbmEen31lB6Xdv5WU+8InKa0+1OsuB8QG0jVa1+a2w="; }; buildInputs = [ jansson openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index b62c95fa5c86..9be574e9eaa0 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; rev = "v${version}"; - hash = "sha256-WWuvUTMrlR6ePbEs01ulLnuMiUqGrh4qELWFh0QMaGU="; + hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/nixpkgs/pkgs/development/libraries/liblcf/default.nix index 45bb7f5b60ed..b91b6ea709ad 100644 --- a/nixpkgs/pkgs/development/libraries/liblcf/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblcf/default.nix @@ -1,19 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, expat +, icu +}: stdenv.mkDerivation rec { pname = "liblcf"; - version = "0.7.0"; + version = "0.8"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "sha256-69cYZ8hJ92gK39gueaEoUM0K7BDWIQ/0NvcQ/6e3Sg8="; + hash = "sha256-jJGIsNw7wplTL5FBWGL8osb9255o9ZaWgl77R+RLDMM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedBuildInputs = [ expat icu ]; + dtrictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + propagatedBuildInputs = [ + expat + icu + ]; + enableParallelBuilding = true; + enableParallelChecking = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; diff --git a/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 56d81e0481d0..b75aba83de69 100644 --- a/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "5"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.46"; + version = "2.47"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "sha256-mKd6idfr6mIIDEie8DCS+drtfpgKoS/5UXI0JenTxlA="; + sha256 = "sha256-so7uCc/52NdN0V2Ska8EUdw/wSegaudX5AF+c0xe5jk="; }; makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmatheval/default.nix b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix index b0fe1c35ef3a..c2084b007a61 100644 --- a/nixpkgs/pkgs/development/libraries/libmatheval/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkg-config autoconf flex ]; + nativeBuildInputs = [ pkg-config flex ]; buildInputs = [ guile ]; src = fetchurl { @@ -14,19 +14,23 @@ stdenv.mkDerivation rec { # Patches coming from debian package # https://packages.debian.org/source/sid/libs/libmatheval - patches = [ (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch"; - sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch"; - sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch"; - sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm"; - } ) - ]; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/002-skip-docs.patch"; + hash = "sha256-wjz54FKQq7t9Bz0W3EOu+ZPTt8EcfkMotkZKwlWa09o="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/003-guile3.0.patch"; + hash = "sha256-H3E/2m4MfQAbjpXbVFyNhikVifi3spVThzaVU5srmjI="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/disable_coth_test.patch"; + hash = "sha256-9XeMXWDTzELWTPcsjAqOlIzp4qY9yupU+e6r0rJEUS0="; + }) + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guile.effectiveVersion}"; + env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guile.effectiveVersion}"; meta = { description = "A library to parse and evaluate symbolic expressions input as text"; @@ -40,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libmatheval/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmcfp/default.nix b/nixpkgs/pkgs/development/libraries/libmcfp/default.nix index 9532d20456d0..7a76fabaa433 100644 --- a/nixpkgs/pkgs/development/libraries/libmcfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmcfp/default.nix @@ -1,23 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "mhekkel"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Mi5nj8vR1j3V7fIMBrSyhD57emmlkCb0F08+5s7Usj0="; + repo = "libmcfp"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-Xz7M3TmUHGqiYZbFGSDxsVvg4VhgoVvr9TW03UxdFBw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; meta = with lib; { description = "Header only library that can collect configuration options from command line arguments"; homepage = "https://github.com/mhekkel/libmcfp"; + changelog = "https://github.com/mhekkel/libmcfp/blob/${finalAttrs.src.rev}/changelog"; license = licenses.bsd2; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 6f85e9e05b66..a74c4e7140fa 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.04"; + version = "23.06"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-NlDt6jJv5U0/Y0YUdkSZUI++7ErphAAvCGrfHQwHGSY="; + sha256 = "sha256-xrGuiyu89AM0BRizyU8q51yOsAaCv7vRiyJELkLcz80="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Shared library for mediainfo"; homepage = "https://mediaarea.net/"; + changelog = "https://mediaarea.net/MediaInfo/ChangeLog"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/nixpkgs/pkgs/development/libraries/libmilter/default.nix b/nixpkgs/pkgs/development/libraries/libmilter/default.nix index ee92235adacc..3ff3a4ffa9fb 100644 --- a/nixpkgs/pkgs/development/libraries/libmilter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmilter"; - version = "8.17.1"; + version = "8.17.2"; src = fetchurl { url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; - sha256 = "sha256-BLx2tsiG5tERvn/Y2qMrjOABKKKItrUuBnvCnzhUpuY="; + sha256 = "sha256-kPWudMNahICIYZM7oJQgG5AbcMaykDaE3POb2uiloaI="; }; buildPhase = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; postInstall = lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames $out/lib/libmilter.dylib.1 + fixDarwinDylibNames $out/lib/libmilter.*.1 ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix b/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix deleted file mode 100644 index a6a20141cc62..000000000000 --- a/nixpkgs/pkgs/development/libraries/libmongo-client/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: - -stdenv.mkDerivation rec { - pname = "libmongo-client"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "algernon"; - repo = "libmongo-client"; - rev = "${pname}-${version}"; - sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ]; - propagatedBuildInputs = [ glib ]; - - postPatch = '' - # Fix when uses glib in public headers - sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in - ''; - - meta = with lib; { - homepage = "http://algernon.github.io/libmongo-client/"; - description = "An alternative C driver for MongoDB"; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix index 8f83c2055c62..cc2a292a0493 100644 --- a/nixpkgs/pkgs/development/libraries/libmwaw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmwaw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmwaw"; - version = "0.3.21"; + version = "0.3.22"; src = fetchurl { url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz"; - sha256 = "sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw="; + sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index f718170fc76c..49e89b97344b 100644 --- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchurl, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { pname = "libnatpmp"; - version = "20150609"; + version = "20230423"; src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; - sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; + url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; + hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA="; }; + patches = [ + # install natpmp_declspec.h too, else nothing that uses this library will build + (fetchpatch { + url = "https://github.com/miniupnp/libnatpmp/commit/5f4a7c65837a56e62c133db33c28cd1ea71db662.patch"; + hash = "sha256-tvoGFmo5AzUgb40bIs/EzikE0ex1SFzE5peLXhktnbc="; + }) + ]; + makeFlags = [ "INSTALLPREFIX=$(out)" "CC:=$(CC)" diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index afbfa5349522..747c8893eb0f 100644 --- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.5"; + version = "1.2.6"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-lm3gqBIMilPbhZiJdJNov7LLoMTwtMGjDSZOzMRfEiY="; + hash = "sha256-zurqLNkhR9oZ8To1p/GkvCdn/4l+g45LR5z1S1nHd/Q="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix b/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix index 2f06fe8eafba..6b847a8e742d 100644 --- a/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "Nitrokey"; repo = "libnitrokey"; rev = "v${finalAttrs.version}"; - hash = "sha256-9ZMR1g04gNzslax6NpD6KykfUfjpKFIizaMMn06iJa0="; + hash = "sha256-4PEZ31QyVOmdhpKqTN8fwcHoLuu+w+OJ3fZeqwlE+io="; + # On OSX, libnitrokey depends on a custom version of hidapi in a submodule. + # Monitor https://github.com/Nitrokey/libnitrokey/issues/140 to see if we + # can remove this extra work one day. + fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libnut/default.nix b/nixpkgs/pkgs/development/libraries/libnut/default.nix new file mode 100644 index 000000000000..401327b0158a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libnut/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchgit +}: +stdenv.mkDerivation rec { + pname = "libnut"; + version = "unstable-2020-11-06"; + + src = fetchgit { + url = "https://git.ffmpeg.org/nut.git"; + rev = "12f6a7af3e0f34fd957cf078b66f072d3dc695b3"; + sha256 = "1wgl2mb9482c1j3yac0v2ilfjs7gb9mhw9kjnrmlj9kp0whm4l1j"; + }; + + sourceRoot = "${src.name}/src/trunk"; + makeFlags = ["prefix=$(out)"]; + installTargets = [ + "install-libnut" + "install-nututils" + ]; + + meta = with lib; { + description = "A library to read/write the NUT video container format"; + homepage = "https://git.ffmpeg.org/gitweb/nut.git"; + license = licenses.mit; + maintainers = with maintainers; [quag]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libopus/default.nix b/nixpkgs/pkgs/development/libraries/libopus/default.nix index 7c563e081d01..b2b095f5607e 100644 --- a/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -1,26 +1,73 @@ -{ lib, stdenv, fetchurl -, fixedPoint ? false, withCustomModes ? true }: +{ lib +, stdenv +, fetchpatch +, fetchurl +, meson +, python3 +, ninja +, fixedPoint ? false +, withCustomModes ? true +, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86 +, withAsm ? false + +# tests +, ffmpeg-headless +}: stdenv.mkDerivation rec { pname = "libopus"; - version = "1.3.1"; + version = "1.4"; src = fetchurl { - url = "mirror://mozilla/opus/opus-${version}.tar.gz"; - sha256 = "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5"; + url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; + sha256 = "sha256-ybMrQlO+WuY9H/Fu6ga5S18PKVG3oCrO71jjo85JxR8="; }; + patches = [ + ./fix-pkg-config-paths.patch + # Some tests time out easily on slower machines + ./test-timeout.patch + # Fix meson build for arm64. Remove with next release + # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59 + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/opus/-/commit/20c032d27c59d65b19b8ffbb2608e5282fe817eb.patch"; + hash = "sha256-2pX+0ay5PTyHL2plameBX2L1Q4aTx7V7RGiTdhNIuE4="; + }) + ]; + + postPatch = '' + patchShebangs meson/ + ''; + outputs = [ "out" "dev" ]; - configureFlags = lib.optional fixedPoint "--enable-fixed-point" - ++ lib.optional withCustomModes "--enable-custom-modes"; + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + mesonFlags = [ + (lib.mesonBool "fixed-point" fixedPoint) + (lib.mesonBool "custom-modes" withCustomModes) + (lib.mesonEnable "intrinsics" withIntrinsics) + (lib.mesonEnable "rtcd" (withIntrinsics || withAsm)) + (lib.mesonEnable "asm" withAsm) + (lib.mesonEnable "docs" false) + ]; doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails + passthru.tests = { + inherit ffmpeg-headless; + }; + meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; - license = lib.licenses.bsd3; - homepage = "https://www.opus-codec.org/"; + homepage = "https://opus-codec.org/"; + changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${version}"; + license = licenses.bsd3; platforms = platforms.all; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch b/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch new file mode 100644 index 000000000000..d54b7f5558c9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch @@ -0,0 +1,13 @@ +--- i/meson.build ++++ w/meson.build +@@ -591,8 +591,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', join_paths(get_option('prefix'))) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', '${prefix}' / get_option('libdir')) ++pkgconf.set('includedir', '${prefix}' / get_option('includedir')) + pkgconf.set('VERSION', opus_version) + pkgconf.set('PC_BUILD', pc_build) + pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch b/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch new file mode 100644 index 000000000000..e20f12cc1d54 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch @@ -0,0 +1,16 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 5f3ac9d..74b2de7 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,8 +1,8 @@ + # Tests that link to libopus + opus_tests = [ +- ['test_opus_api'], +- ['test_opus_decode', [], 60], +- ['test_opus_encode', 'opus_encode_regressions.c', 120], ++ ['test_opus_api', [], 60], ++ ['test_opus_decode', [], 120], ++ ['test_opus_encode', 'opus_encode_regressions.c', 240], + ['test_opus_padding'], + ['test_opus_projection'], + ] diff --git a/nixpkgs/pkgs/development/libraries/liboqs/default.nix b/nixpkgs/pkgs/development/libraries/liboqs/default.nix index 41ba6e61e70c..c2a0216a34e1 100644 --- a/nixpkgs/pkgs/development/libraries/liboqs/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboqs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "liboqs"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = pname; rev = version; - sha256 = "sha256-cwrTHj/WFDZ9Ez2FhjpRhEx9aC5xBnh7HR/9T+zUpZc="; + sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index 003ec110f529..36820a2eecc2 100644 --- a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which, squawk }: stdenv.mkDerivation rec { pname = "libpg_query"; - version = "15-4.2.1"; + version = "15-4.2.3"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - hash = "sha256-wbWW2r8Ai4Y+JBI5DbMuVx326bAxmEgQlTd6nnzqDXw="; + hash = "sha256-/HUg6x0il5WxENmgR3slu7nmXTKv6YscjpX569Dztko="; }; nativeBuildInputs = [ which ]; @@ -24,10 +24,14 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + passthru.tests = { + inherit squawk; + }; + meta = with lib; { homepage = "https://github.com/pganalyze/libpg_query"; description = "C library for accessing the PostgreSQL parser outside of the server environment"; - changelog = "https://github.com/pganalyze/libpg_query/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/pganalyze/libpg_query/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix index 2247c3b9406f..ce0b396eed18 100644 --- a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "libpinyin"; - version = "2.6.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; rev = version; - sha256 = "sha256-hafetjKWqImg3Jr1tSXjY0RwbBQ7LccXqx0OdtKCy/c="; + hash = "sha256-3+CBbjCaY0Ubyphf0uCfYvF2rtc9fF1eEAM1doonjHg="; }; postUnpack = '' diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix index 23b1fabce78b..afd28996265c 100644 --- a/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -10,21 +10,17 @@ stdenv.mkDerivation rec { pname = "libplist"; - version = "2.2.0+date=2022-04-05"; + version = "2.3.0"; outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "db93bae96d64140230ad050061632531644c46ad"; - hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo="; + rev = version; + hash = "sha256-fZfDSWVRg73dN+WF6LbgRSj8vtyeKeyjC8pWXFxUmBg="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -35,10 +31,18 @@ stdenv.mkDerivation rec { python3.pkgs.cython ]; - configureFlags = lib.optionals (!enablePython) [ + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + + configureFlags = [ + "--enable-debug" + ] ++ lib.optionals (!enablePython) [ "--without-cython" ]; + doCheck = true; + postFixup = lib.optionalString enablePython '' moveToOutput "lib/${python3.libPrefix}" "$py" ''; @@ -49,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; platforms = platforms.unix; + mainProgram = "plistutil"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix index d16c6f7f1839..d87ef2b72802 100644 --- a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix @@ -1,7 +1,7 @@ { lib , clang-tools , llvmPackages -, boost17x +, boost179 , protobuf , python3Support ? false , python3 @@ -40,7 +40,7 @@ let # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails clangTools = clang-tools.override { inherit stdenv llvmPackages; }; # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper - boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x; + boost = if python3Support then boost179.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost179; defaultOptionals = [ boost protobuf ] ++ lib.optional python3Support python3 ++ lib.optional snappySupport snappy.dev diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index dfedf2f9cadf..b84562850efe 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.6.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-GOVSNEnEl/oef54q88s+YuLyqPMLyx1eoX7DlWrmo2c="; + sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libqb/default.nix b/nixpkgs/pkgs/development/libraries/libqb/default.nix index 5cbc9b8f09b7..8e798e4a38a4 100644 --- a/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.6"; + version = "2.0.8"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vt9FmIRojX3INOn3CXAjkswVFD8Th4sRIz3RR4GJHFQ="; + sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index e2c7fcea1953..62aa346e002a 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch2 , meson , ninja , pkg-config @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.32.2"; + version = "1.32.4"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; @@ -34,18 +33,9 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libqmi"; rev = version; - hash = "sha256-XIbeWgkPiJL8hN8Rb6KFt5Q5sG3KsiEQr0EnhwmI6h8="; + hash = "sha256-cczGvoD+2+G6uiAt0Iv1BO4/FqzO9bkqhFsEwOfp7qw="; }; - patches = [ - # Fix pkg-config file missing qrtr in Requires. - # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/99 - (fetchpatch2 { - url = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/7d08150910974c6bd2c29f887c2c6d4a3526e085.patch"; - hash = "sha256-LFrlm2ZqLqewLGO2FxL5kFYbZ7HaxdxvVHsFHYSgZ4Y="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix b/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix new file mode 100644 index 000000000000..491b8583fc93 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchbzr +, testers +, cmake +, cmake-extras +, dbus +, dbus-test-runner +, gtest +, libqtdbustest +, networkmanager +, pkg-config +, procps +, python3 +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libqtdbusmock"; + version = "unstable-2017-03-16"; + + src = fetchbzr { + url = "lp:libqtdbusmock"; + rev = "49"; + sha256 = "sha256-q3jL8yGLgcNxXHPh9M9cTVtUvonrBUPNxuPJIvu7Q/s="; + }; + + postPatch = '' + # Look for the new(?) name + substituteInPlace CMakeLists.txt \ + --replace 'NetworkManager' 'libnm' + + # Workaround for "error: expected unqualified-id before 'public'" on "**signals" + sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt + '' + lib.optionalString (!finalAttrs.doCheck) '' + # Don't build tests when we're not running them + sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cmake-extras + libqtdbustest + networkmanager + qtbase + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + procps + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + gtest + ]; + + dontWrapQtApps = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + enableParallelChecking = false; + + checkPhase = '' + runHook preCheck + + dbus-test-runner -t make -p test -p "''${enableParallelChecking:+-j $NIX_BUILD_CORES}" + + runHook postCheck + ''; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "Library for mocking DBus interactions using Qt"; + homepage = "https://launchpad.net/libqtdbusmock"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = teams.lomiri.members; + pkgConfigModules = [ + "libqtdbusmock-1" + ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix b/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix new file mode 100644 index 000000000000..8ef8975a01af --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libqtdbustest/default.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchbzr +, fetchpatch +, testers +, cmake +, cmake-extras +, dbus +, dbus-test-runner +, gtest +, pkg-config +, procps +, python3 +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libqtdbustest"; + version = "unstable-2017-01-06"; + + src = fetchbzr { + url = "lp:libqtdbustest"; + rev = "42"; + sha256 = "sha256-5MQdGGtEVE/pM9u0B0xFXyITiRln9p+8/MLtrrCZqi8="; + }; + + patches = [ + # Tests are overly pedantic when looking for launched process names in `ps`, break on python wrapper vs real python + # Just check if basename + arguments match, like libqtdbusmock does + ./less-pedantic-process-finding.patch + + # Disable QProcess start timeout + (fetchpatch { + url = "https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/raw/0788df10bc6f2aa47c2b73fc1df944686a9ace1e/debian/patches/1003_no-QProcess-waitForstarted-timeout.patch"; + hash = "sha256-ThDbn6URvkj5ARDMj+xO0fb1Qh2YQRzVy24O03KglHI="; + }) + + # More robust dbus address reading + (fetchpatch { + url = "https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/raw/7e55c79cd032c702b30d834c1fb0b65661fc6eeb/debian/patches/1004_make-reading-address-from-dbus-daemon-more-robust.patch"; + hash = "sha256-hq8pdducp/udxoGWGt1dgL/7VHcbJO/oT1dOY1zew8M="; + }) + ]; + + strictDeps = true; + + postPatch = lib.optionalString (!finalAttrs.doCheck) '' + # Don't build tests when we're not running them + sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cmake-extras + qtbase + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + procps + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + gtest + ]; + + dontWrapQtApps = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + enableParallelChecking = false; + + checkPhase = '' + runHook preCheck + + dbus-test-runner -t make -p test -p "''${enableParallelChecking:+-j $NIX_BUILD_CORES}" + + runHook postCheck + ''; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "Library for testing DBus interactions using Qt"; + homepage = "https://launchpad.net/libqtdbustest"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = teams.lomiri.members; + mainProgram = "qdbus-simple-test-runner"; + pkgConfigModules = [ + "libqtdbustest-1" + ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch b/nixpkgs/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch new file mode 100644 index 000000000000..b50fc5d1e476 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch @@ -0,0 +1,86 @@ +diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestDBusTestRunner.cpp b/tests/libqtdbustest/TestDBusTestRunner.cpp +--- a/tests/libqtdbustest/TestDBusTestRunner.cpp 2023-01-20 21:36:16.948292559 +0100 ++++ b/tests/libqtdbustest/TestDBusTestRunner.cpp 2023-01-20 21:55:40.554530221 +0100 +@@ -44,7 +44,7 @@ + TEST_F(TestDBusTestRunner, StartsSessionService) { + QSharedPointer<QProcessDBusService> process( + new QProcessDBusService("test.session.name", +- QDBusConnection::SessionBus, "/usr/bin/python3", ++ QDBusConnection::SessionBus, "python3", + QStringList() << "-m" << "dbusmock" << "test.session.name" + << "/test/object" << "test.Interface")); + +@@ -58,15 +58,14 @@ + pgrep.waitForFinished(); + pgrep.waitForReadyRead(); + +- EXPECT_EQ( +- "/usr/bin/python3 -m dbusmock test.session.name /test/object test.Interface", +- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString()); ++ EXPECT_TRUE( ++ pgrep.readAll().contains("python3 -m dbusmock test.session.name /test/object test.Interface")); + } + + TEST_F(TestDBusTestRunner, StartsSystemService) { + QSharedPointer<QProcessDBusService> process( + new QProcessDBusService("test.system.name", +- QDBusConnection::SystemBus, "/usr/bin/python3", ++ QDBusConnection::SystemBus, "python3", + QStringList() << "-m" << "dbusmock" << "-s" + << "test.system.name" << "/test/object" + << "test.Interface")); +@@ -81,9 +80,8 @@ + pgrep.waitForFinished(); + pgrep.waitForReadyRead(); + +- EXPECT_EQ( +- "/usr/bin/python3 -m dbusmock -s test.system.name /test/object test.Interface", +- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString()); ++ EXPECT_TRUE( ++ pgrep.readAll().contains("python3 -m dbusmock -s test.system.name /test/object test.Interface")); + } + + TEST_F(TestDBusTestRunner, SetsEnvironmentVariables) { +diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusService.cpp b/tests/libqtdbustest/TestQProcessDBusService.cpp +--- a/tests/libqtdbustest/TestQProcessDBusService.cpp 2023-01-20 21:36:16.948292559 +0100 ++++ b/tests/libqtdbustest/TestQProcessDBusService.cpp 2023-01-20 21:54:34.633384937 +0100 +@@ -45,7 +45,7 @@ + + TEST_F(TestQProcessDBusService, WaitsForServiceAppeared) { + QProcessDBusService process("test.name", QDBusConnection::SessionBus, +- "/usr/bin/python3", ++ "python3", + QStringList() << "-m" << "dbusmock" << "test.name" << "/test/object" + << "test.Interface"); + +@@ -58,14 +58,13 @@ + pgrep.waitForFinished(); + pgrep.waitForReadyRead(); + +- EXPECT_EQ( +- "/usr/bin/python3 -m dbusmock test.name /test/object test.Interface", +- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString()); ++ EXPECT_TRUE( ++ pgrep.readAll().contains("python3 -m dbusmock test.name /test/object test.Interface")); + } + + TEST_F(TestQProcessDBusService, ThrowsErrorForFailToStart) { + QProcessDBusService process("test.name", QDBusConnection::SessionBus, +- "/usr/bin/python3", ++ "python3", + QStringList() << "-m" << "dbusmock" << "not.test.name" + << "/test/object" << "test.Interface"); + +diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestSuicidalProcess.cpp b/tests/libqtdbustest/TestSuicidalProcess.cpp +--- a/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:36:16.948292559 +0100 ++++ b/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:55:07.219951081 +0100 +@@ -51,8 +51,7 @@ + pgrep.waitForFinished(); + pgrep.waitForReadyRead(); + +- EXPECT_EQ("sleep 5", +- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString()); ++ EXPECT_TRUE(pgrep.readAll().contains("sleep 5")); + } + + } // namespace diff --git a/nixpkgs/pkgs/development/libraries/libraqm/default.nix b/nixpkgs/pkgs/development/libraries/libraqm/default.nix new file mode 100644 index 000000000000..4ce422858f5b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libraqm/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, freetype +, harfbuzz +, fribidi +}: + +stdenv.mkDerivation rec { + pname = "libraqm"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "HOST-Oman"; + repo = "libraqm"; + rev = "v${version}"; + sha256 = "sha256-H9W+7Mob3o5ctxfp5UhIxatSdXqqvkpyEibJx9TO7a8="; + }; + + buildInputs = [ freetype harfbuzz fribidi ]; + + nativeBuildInputs = [ pkg-config meson ninja ]; + + doCheck = true; + + meta = with lib; { + description = "A library for complex text layout"; + homepage = "https://github.com/HOST-Oman/libraqm"; + license = licenses.mit; + maintainers = with maintainers; [ sifmelcara ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index bc0ae86aec35..14f02d8481e9 100644 --- a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -16,17 +16,11 @@ stdenv.mkDerivation rec { hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw=="; }; - patches = [ - (fetchpatch { - # https://github.com/raspberrypi/userland/pull/670 - url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; - sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ - (if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF") + # -DARM64=ON disables all targets that only build on 32-bit ARM; this allows + # the package to build on aarch64 and other architectures + "-DARM64=${if stdenv.hostPlatform.isAarch32 then "OFF" else "ON"}" "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" ]; diff --git a/nixpkgs/pkgs/development/libraries/librclone/default.nix b/nixpkgs/pkgs/development/libraries/librclone/default.nix index 3b8bf83364c9..bb3053e19d53 100644 --- a/nixpkgs/pkgs/development/libraries/librclone/default.nix +++ b/nixpkgs/pkgs/development/libraries/librclone/default.nix @@ -8,7 +8,9 @@ let ext = stdenv.hostPlatform.extensions.sharedLibrary; in buildGoModule rec { pname = "librclone"; - inherit (rclone) version src vendorSha256; + inherit (rclone) version src vendorHash; + + patches = rclone.patches or [ ]; buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index b085e080803b..4503a0cc43ed 100644 --- a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff"; sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao="; }) + # pull upstream fix for libxml2-2.11 API compatibility: + # https://github.com/dajobe/raptor/pull/58 + (fetchpatch { + name = "libxml2-2.11.patch"; + url = "https://github.com/dajobe/raptor/commit/4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch"; + hash = "sha256-fHfvncGymzMtxjwtakCNSr/Lem12UPIHAAcAac648w4="; + }) ]; nativeBuildInputs = [ pkg-config cmake perl bison flex ]; diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 59bc2a056616..aec9cfaaf91a 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -13,7 +13,7 @@ , glfw , libGLU , curl -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , enablePython ? false, pythonPackages ? null , enableGUI ? false, }: @@ -78,7 +78,10 @@ stdenv.mkDerivation rec { # script does not do this, and it's questionable if intel knows it should be # done # ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 ) - postInstall = lib.optionalString enablePython '' + postInstall = '' + substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \ + --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" + '' + lib.optionalString enablePython '' cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 ''; diff --git a/nixpkgs/pkgs/development/libraries/libremidi/default.nix b/nixpkgs/pkgs/development/libraries/libremidi/default.nix index 63a7f0ce5287..d88ebeea3fb5 100644 --- a/nixpkgs/pkgs/development/libraries/libremidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libremidi/default.nix @@ -9,15 +9,15 @@ , stdenv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libremidi"; - version = "unstable-2023-05-05"; + version = "3.0"; src = fetchFromGitHub { owner = "jcelerier"; repo = "libremidi"; - rev = "cd2e52d59c8ecc97d751619072c4f4271fa82455"; - hash = "sha256-CydoCprxqDl5FXjtgT+AckaRTqQAlCDwwrnPDK17A6o="; + rev = "v${version}"; + hash = "sha256-aO83a0DmzwjYXDlPIsn136EkDF0406HadTXPoGuVF6I="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index 2ee2c0ce9f44..a9dc9f349fff 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -62,7 +62,7 @@ let ''} ''; - doCheck = !stdenv.hostPlatform.isPower64; + doCheck = !(stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV); preCheck = '' export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName} export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)" @@ -91,29 +91,13 @@ let }; in { - libressl_3_4 = generic { - version = "3.4.3"; - hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; - knownVulnerabilities = [ "Support ended 2022-10-14." ]; - patches = [ - (fetchpatch { - # https://marc.info/?l=libressl&m=167582148932407&w=2 - name = "backport-type-confusion-fix.patch"; - url = "https://raw.githubusercontent.com/libressl/portable/30dc760ed1d7c70766b135500950d8ca9d17b13a/patches/x509_genn.c.diff"; - sha256 = "sha256-N9jsOueqposDWZwaR+n/v/cHgNiZbZ644d8/wKjN2/M="; - stripLen = 2; - extraPrefix = "crypto/"; - }) - ]; - }; - libressl_3_6 = generic { - version = "3.6.2"; - hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM="; + version = "3.6.3"; + hash = "sha256-h7G7426e7I0K5fBMg9NrLFsOWBeEx+sIFwJe0p6t6jc="; }; libressl_3_7 = generic { - version = "3.7.2"; - hash = "sha256-sGqlOP78nGszxNtJMaCaX1LZ0jVyGa/L/32T/hLr9vc="; + version = "3.7.3"; + hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; }; } diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 57ed620fbf8d..9974826573a7 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -30,30 +30,32 @@ , nix }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.55.1"; + version = "2.56.2"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a69IqdOlb9E7v7ufH3Z1myQLcKH6Ig/SOEdNZqkm+Yw="; + url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; + sha256 = "PsPE2Pc+C6S5EwAmlp6DccCStzQpjTbi/bPrSvzsEgA="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-nRmOB9Jo+mmB0+wXrQvoII4e0ucV7bNCDeuk6CbcPdk="; + inherit (finalAttrs) src; + name = "librsvg-deps-${finalAttrs.version}"; + hash = "sha256-GIEpZ5YMvmYQLcaLXseXQ6gIF7ICtUKq28JCVJ3PEYk="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; strictDeps = true; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ gdk-pixbuf @@ -100,6 +102,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders ''; + # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK + # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually. + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + NIX_LDFLAGS = "-lobjc"; + }; + preConfigure = '' PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" export PKG_CONFIG_VAPIGEN_VAPIGEN @@ -137,6 +145,13 @@ stdenv.mkDerivation rec { # Merge gdkpixbuf and librsvg loaders cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + + mkdir -p "$out/share/bash-completion/completions/" + $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + mkdir -p "$out/share/zsh/site-functions/" + $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + mkdir -p "$out/share/fish/vendor_completions.d/" + $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" ''; postFixup = lib.optionalString withIntrospection '' @@ -189,4 +204,4 @@ stdenv.mkDerivation rec { mainProgram = "rsvg-convert"; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libsciter/default.nix b/nixpkgs/pkgs/development/libraries/libsciter/default.nix index 034ccc4208f8..9e9c0aece0ba 100644 --- a/nixpkgs/pkgs/development/libraries/libsciter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsciter/default.nix @@ -3,14 +3,13 @@ , cairo , libuuid , pango -, gdk-pixbuf , gtk3 , stdenv , fetchurl , autoPatchelfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libsciter"; version = "4.4.8.23-bis"; # Version specified in GitHub commit title diff --git a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix index bbd892c33ee8..9ae8d87f8872 100644 --- a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix @@ -9,22 +9,20 @@ }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.3-20230626"; + commit = "783141fb694f3bd1f8bd8a783670dd25a53b9fc1"; pname = "libsearpc"; src = fetchFromGitHub { owner = "haiwen"; repo = "libsearpc"; - rev = "v${version}"; - sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd"; + rev = commit; + sha256 = "sha256-nYYp3EyA8nufhbWaw4Lv/c4utGYaxC+PoFyamUEVJx4="; }; nativeBuildInputs = [ autoreconfHook pkg-config - ]; - - buildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libsegfault/default.nix b/nixpkgs/pkgs/development/libraries/libsegfault/default.nix index e3a27c212847..721570f330b3 100644 --- a/nixpkgs/pkgs/development/libraries/libsegfault/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsegfault/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw="; }; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; + nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/nixpkgs/pkgs/development/libraries/libshumate/default.nix index 810047394e30..e449a9085bbe 100644 --- a/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.3"; + version = "1.0.5"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y="; + sha256 = "mHfhCKzLfP1BkqM+FiLUlo/I0TCe3G8C0lmO6007pMY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 84d0f01c1549..194da3121615 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, makeFontsConf , nix-update-script , autoreconfHook , pkg-config @@ -16,28 +17,30 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds="; + sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA="; }; postPatch = '' patchShebangs . ''; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config perl xa ] ++ lib.optionals docSupport [ doxygen graphviz ]; buildInputs = [ libgcrypt libexsid ]; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - nativeCheckInputs = [ unittest-cpp ]; + checkInputs = [ unittest-cpp ]; enableParallelBuilding = true; @@ -54,6 +57,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional doCheck "--enable-tests"; + FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); + + preBuild = '' + # Reduce noise from fontconfig during doc building + export XDG_CACHE_HOME=$TMPDIR + ''; + postInstall = lib.optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/ diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 2e5eccf5263b..7e912a6bcad9 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config -, zlib, xz, bzip2, zchunk, zstd +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, zlib +, xz +, bzip2 +, zchunk +, zstd , expat -, withRpm ? !stdenv.isDarwin, rpm +, withRpm ? !stdenv.isDarwin +, rpm , db }: stdenv.mkDerivation rec { - version = "0.7.24"; + version = "0.7.24"; pname = "libsolv"; src = fetchFromGitHub { - owner = "openSUSE"; - repo = "libsolv"; - rev = version; + owner = "openSUSE"; + repo = "libsolv"; + rev = version; sha256 = "sha256-UTVnGJO/9mQF9RwK75hh6IkoP1MwAlFaLCtdYU8uS34="; }; @@ -24,6 +34,7 @@ stdenv.mkDerivation rec { "-DENABLE_ZCHUNK_COMPRESSION=true" "-DWITH_SYSTEM_ZCHUNK=true" ] ++ lib.optionals withRpm [ + "-DENABLE_COMPS=true" "-DENABLE_PUBKEY=true" "-DENABLE_RPMDB=true" "-DENABLE_RPMDB_BYRPMHEADER=true" @@ -36,10 +47,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free package dependency solver"; - homepage = "https://github.com/openSUSE/libsolv"; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/openSUSE/libsolv"; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ copumpkin ]; }; } - diff --git a/nixpkgs/pkgs/development/libraries/libspelling/default.nix b/nixpkgs/pkgs/development/libraries/libspelling/default.nix new file mode 100644 index 000000000000..32c1af55a37f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libspelling/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, glib +, gtk4 +, gtksourceview5 +, enchant +, icu +}: + +stdenv.mkDerivation { + pname = "libspelling"; + version = "unstable-2023-07-17"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "chergert"; + repo = "libspelling"; + rev = "65185023db95ec464970aeaeab766fe3ba26ae7d"; + hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + buildInputs = [ + glib + gtk4 + gtksourceview5 + enchant + icu + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + meta = with lib; { + description = "Spellcheck library for GTK 4"; + homepage = "https://gitlab.gnome.org/chergert/libspelling"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix index ba1455350e60..091885a1f084 100644 --- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = [ openssl zlib ] + propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc + buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix index 49779f825009..880d468cae05 100644 --- a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-jT4VIqqUldCj3Rsb5MC74WXYQyTqOZxzFADf47TBV8c="; + sha256 = "EDgdKJ7wqUoThy0t1r39p2lbn64uvTDoIqNCzhpWnZ8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libsvm/default.nix b/nixpkgs/pkgs/development/libraries/libsvm/default.nix index 4274ad047910..ca97bdbec891 100644 --- a/nixpkgs/pkgs/development/libraries/libsvm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsvm/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libsvm"; - version = "3.31"; + version = "3.32"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "sha256-AKtWH0jfX8kqhCCa2P5Rmery5Rmzwnm6z8k1l4p1zx8="; + sha256 = "sha256-hkTMZRjKiLvFDYyOrRc08aubbxcBcEXvmuOHc6plPa0="; }; patches = lib.optionals withOpenMP [ ./openmp.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libthai/default.nix b/nixpkgs/pkgs/development/libraries/libthai/default.nix index 7755fffc7a97..eceaf8c08f53 100644 --- a/nixpkgs/pkgs/development/libraries/libthai/default.nix +++ b/nixpkgs/pkgs/development/libraries/libthai/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libtickit/default.nix b/nixpkgs/pkgs/development/libraries/libtickit/default.nix new file mode 100644 index 000000000000..782a5ae486c1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtickit/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libtermkey +, unibilium +, libtool +}: +stdenv.mkDerivation rec { + pname = "libtickit"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "leonerd"; + repo = "libtickit"; + rev = "v${version}"; + hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; + }; + + makeFlags = [ + "PREFIX=$(out)" + "LIBTOOL=${lib.getExe libtool}" + ]; + + nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ libtermkey unibilium ]; + + meta = with lib; { + description = "A terminal interface construction kit"; + longDescription = '' + This library provides an abstracted mechanism for building interactive full-screen terminal + programs. It provides a full set of output drawing functions, and handles keyboard and mouse + input events. + ''; + homepage = "https://www.leonerd.org.uk/code/libtickit/"; + license = licenses.mit; + maintainers = with maintainers; [ onemoresuza ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 06dc76d92328..4fc6449230dc 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , nix-update-script , autoreconfHook @@ -25,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-KG6rB940JMjFUTAgtkzg+Zh75gylPY6Q7/4gEbL0Hcs="; + hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; }; patches = [ @@ -40,32 +39,6 @@ stdenv.mkDerivation rec { # libc++abi 11 has an `#include <version>`, this picks up files name # `version` in the project's include paths ./rename-version.patch - (fetchpatch { - name = "CVE-2022-48281.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/d1b6b9c1b3cae2d9e37754506c1ad8f4f7b646b5.diff"; - sha256 = "sha256-FWUlyJyHXac6fuM5f9PG33kcF5Bm4fyFmYnaDal46iM="; - }) - (fetchpatch { - name = "CVE-2023-0800.CVE-2023-0801.CVE-2023-0802.CVE-2023-0803.CVE-2023-0804.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/33aee1275d9d1384791d2206776eb8152d397f00.patch"; - sha256 = "sha256-wNSa1D9EWObTs331utjIKgo9p9PUWqTM54qG+1Hhm1A="; - }) - (fetchpatch { - name = "CVE-2023-0795.CVE-2023-0796.CVE-2023-0797.CVE-2023-0798.CVE-2023-0799.prerequisite-0.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/9c22495e5eeeae9e00a1596720c969656bb8d678.patch"; - sha256 = "sha256-NTs+dCUweKddQDzJLqbdIdvNbaSweGG0cSVt57tntoI="; - }) - (fetchpatch { - name = "CVE-2023-0795.CVE-2023-0796.CVE-2023-0797.CVE-2023-0798.CVE-2023-0799.prerequisite-1.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/d63de61b1ec3385f6383ef9a1f453e4b8b11d536.patch"; - includes = [ "tools/tiffcrop.c" ]; - sha256 = "sha256-VHg5aAcHKwRkDFDyC1rLjCjj1rMzcq/2SUR/r1fQubQ="; - }) - (fetchpatch { - name = "CVE-2023-0795.CVE-2023-0796.CVE-2023-0797.CVE-2023-0798.CVE-2023-0799.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/afaabc3e50d4e5d80a94143f7e3c997e7e410f68.patch"; - sha256 = "sha256-9+oXKVJEeaIuMBdtvhNlUBNpw9uzg31s+zxt4GJo6Lo="; - }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 63e0dae08a3f..87d6633f124e 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, cmake, libsodium, ncurses, libopus, msgpack -, libvpx, check, libconfig, pkg-config }: +{ lib +, stdenv +, fetchurl +, cmake +, libsodium +, ncurses +, libopus +, libvpx +, check +, libconfig +, pkg-config +}: let buildToxAV = !stdenv.isAarch32; in stdenv.mkDerivation rec { @@ -14,14 +24,18 @@ in stdenv.mkDerivation rec { sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI="; }; - cmakeFlags = - [ "-DBUILD_NTOX=ON" "-DDHT_BOOTSTRAP=ON" "-DBOOTSTRAP_DAEMON=ON" ] - ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; + cmakeFlags = [ + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ] ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; buildInputs = [ - libsodium msgpack ncurses libconfig + libsodium + ncurses + libconfig ] ++ lib.optionals buildToxAV [ - libopus libvpx + libopus + libvpx ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix b/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix index 1a3bdfaa02b3..ffacc906b4ea 100644 --- a/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix +++ b/nixpkgs/pkgs/development/libraries/libudev-zero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libudev-zero"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "illiliti"; repo = "libudev-zero"; rev = version; - sha256 = "sha256-SU1pPmLLeTWZe5ybhmDplFw6O/vpEjFAKgfKDl0RS4U="; + sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI="; }; makeFlags = [ "PREFIX=$(out)" "AR=${stdenv.cc.targetPrefix}ar" ]; diff --git a/nixpkgs/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch b/nixpkgs/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch deleted file mode 100644 index 191f6ae8cd5a..000000000000 --- a/nixpkgs/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d4714fd7aac9c5f499c406703bc437dc6cf72ef3 Mon Sep 17 00:00:00 2001 -From: Steffen <steffen.winter@proton.me> -Date: Mon, 13 Feb 2023 17:32:16 +0100 -Subject: [PATCH 1/3] Add custom error function for tests. - -On musl systems, liburing cannot build examples and tests due to -it's usage of error.h. t_error calls fprintf(stderr, ...) and -exits. - -Closes: #786 - -Signed-off-by: Steffen Winter <steffen.winter@proton.me> ---- - test/helpers.c | 18 ++++++++++++++++++ - test/helpers.h | 2 ++ - 2 files changed, 20 insertions(+) - -diff --git a/test/helpers.c b/test/helpers.c -index 8fb32b8..caa887e 100644 ---- a/test/helpers.c -+++ b/test/helpers.c -@@ -8,6 +8,7 @@ - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h> -+#include <stdarg.h> - #include <sys/types.h> - - #include <arpa/inet.h> -@@ -266,3 +267,20 @@ bool t_probe_defer_taskrun(void) - io_uring_queue_exit(&ring); - return true; - } -+ -+/* -+ * Implementation of error(3), prints an error message and exits. -+ */ -+void t_error(int status, int errnum, const char *format, ...) -+{ -+ va_list args; -+ va_start(args, format); -+ -+ vfprintf(stderr, format, args); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ -+ fprintf(stderr, "\n"); -+ va_end(args); -+ exit(status); -+} -diff --git a/test/helpers.h b/test/helpers.h -index 4375a9e..33b82cf 100644 ---- a/test/helpers.h -+++ b/test/helpers.h -@@ -87,6 +87,8 @@ bool t_probe_defer_taskrun(void); - - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - -+void t_error(int status, int errnum, const char *format, ...); -+ - #ifdef __cplusplus - } - #endif --- -2.39.1 - diff --git a/nixpkgs/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch b/nixpkgs/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch deleted file mode 100644 index 676b006482c4..000000000000 --- a/nixpkgs/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch +++ /dev/null @@ -1,109 +0,0 @@ -From e84f40ca872f0bce72b5686c95a11739d9c89494 Mon Sep 17 00:00:00 2001 -From: Steffen <steffen.winter@proton.me> -Date: Mon, 13 Feb 2023 17:56:03 +0100 -Subject: [PATCH 2/3] test: Use t_error instead of glibc's error. - -On musl systems, liburing cannot build examples and tests due to -it's usage of error.h. Replacing calls to error() with t_error(). - -Closes: #786 - -Signed-off-by: Steffen Winter <steffen.winter@proton.me> ---- - test/defer-taskrun.c | 1 - - test/send-zerocopy.c | 1 - - test/single-issuer.c | 15 +++++++-------- - 3 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/test/defer-taskrun.c b/test/defer-taskrun.c -index 9283f28..87cd256 100644 ---- a/test/defer-taskrun.c -+++ b/test/defer-taskrun.c -@@ -4,7 +4,6 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> - #include <sys/eventfd.h> - #include <signal.h> - #include <poll.h> -diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c -index 4db102b..be33094 100644 ---- a/test/send-zerocopy.c -+++ b/test/send-zerocopy.c -@@ -4,7 +4,6 @@ - #include <stdint.h> - #include <assert.h> - #include <errno.h> --#include <error.h> - #include <limits.h> - #include <fcntl.h> - #include <unistd.h> -diff --git a/test/single-issuer.c b/test/single-issuer.c -index 1d13f47..d71cd74 100644 ---- a/test/single-issuer.c -+++ b/test/single-issuer.c -@@ -5,7 +5,6 @@ - #include <stdlib.h> - #include <string.h> - #include <fcntl.h> --#include <error.h> - #include <sys/types.h> - #include <sys/wait.h> - -@@ -56,13 +55,13 @@ static int try_submit(struct io_uring *ring) - return ret; - - if (ret != 1) -- error(1, ret, "submit %i", ret); -+ t_error(1, ret, "submit %i", ret); - ret = io_uring_wait_cqe(ring, &cqe); - if (ret) -- error(1, ret, "wait fail %i", ret); -+ t_error(1, ret, "wait fail %i", ret); - - if (cqe->res || cqe->user_data != 42) -- error(1, ret, "invalid cqe"); -+ t_error(1, ret, "invalid cqe"); - - io_uring_cqe_seen(ring, cqe); - return 0; -@@ -106,7 +105,7 @@ int main(int argc, char *argv[]) - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | - IORING_SETUP_R_DISABLED); - if (ret) -- error(1, ret, "ring init (2) %i", ret); -+ t_error(1, ret, "ring init (2) %i", ret); - - if (!fork_t()) { - io_uring_enable_rings(&ring); -@@ -122,7 +121,7 @@ int main(int argc, char *argv[]) - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | - IORING_SETUP_R_DISABLED); - if (ret) -- error(1, ret, "ring init (3) %i", ret); -+ t_error(1, ret, "ring init (3) %i", ret); - - io_uring_enable_rings(&ring); - if (!fork_t()) { -@@ -137,7 +136,7 @@ int main(int argc, char *argv[]) - /* test that anyone can submit to a SQPOLL|SINGLE_ISSUER ring */ - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER|IORING_SETUP_SQPOLL); - if (ret) -- error(1, ret, "ring init (4) %i", ret); -+ t_error(1, ret, "ring init (4) %i", ret); - - ret = try_submit(&ring); - if (ret) { -@@ -157,7 +156,7 @@ int main(int argc, char *argv[]) - /* test that IORING_ENTER_REGISTERED_RING doesn't break anything */ - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER); - if (ret) -- error(1, ret, "ring init (5) %i", ret); -+ t_error(1, ret, "ring init (5) %i", ret); - - if (!fork_t()) { - ret = try_submit(&ring); --- -2.39.1 - diff --git a/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch b/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch deleted file mode 100644 index ce92f16dcb18..000000000000 --- a/nixpkgs/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch +++ /dev/null @@ -1,226 +0,0 @@ -From 23704bbd1416ed1a051b32d5d44e46dd654b8ffe Mon Sep 17 00:00:00 2001 -From: Steffen <steffen.winter@proton.me> -Date: Mon, 13 Feb 2023 18:23:44 +0100 -Subject: [PATCH 3/3] examples: Use t_error instead of glibc's error. - -On musl systems, liburing cannot build examples and tests due to -it's usage of error.h. t_error copied from test/helpers.c. -Replacing calls to error() with t_error(). - -Closes: #786 - -Signed-off-by: Steffen Winter <steffen.winter@proton.me> ---- - examples/send-zerocopy.c | 61 +++++++++++++++++++++++++--------------- - 1 file changed, 39 insertions(+), 22 deletions(-) - -diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c -index 7f5f2b1..6092af9 100644 ---- a/examples/send-zerocopy.c -+++ b/examples/send-zerocopy.c -@@ -5,11 +5,11 @@ - #include <stdint.h> - #include <assert.h> - #include <errno.h> --#include <error.h> - #include <limits.h> - #include <fcntl.h> - #include <unistd.h> - #include <stdbool.h> -+#include <stdarg.h> - #include <string.h> - - #include <arpa/inet.h> -@@ -57,6 +57,23 @@ static struct sockaddr_storage cfg_dst_addr; - - static char payload[IP_MAXPACKET] __attribute__((aligned(4096))); - -+/* -+ * Implementation of error(3), prints an error message and exits. -+ */ -+static void t_error(int status, int errnum, const char *format, ...) -+{ -+ va_list args; -+ va_start(args, format); -+ -+ vfprintf(stderr, format, args); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ -+ fprintf(stderr, "\n"); -+ va_end(args); -+ exit(status); -+} -+ - static unsigned long gettimeofday_ms(void) - { - struct timeval tv; -@@ -68,7 +85,7 @@ static unsigned long gettimeofday_ms(void) - static void do_setsockopt(int fd, int level, int optname, int val) - { - if (setsockopt(fd, level, optname, &val, sizeof(val))) -- error(1, errno, "setsockopt %d.%d: %d", level, optname, val); -+ t_error(1, errno, "setsockopt %d.%d: %d", level, optname, val); - } - - static void setup_sockaddr(int domain, const char *str_addr, -@@ -84,7 +101,7 @@ static void setup_sockaddr(int domain, const char *str_addr, - addr4->sin_port = htons(cfg_port); - if (str_addr && - inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) != 1) -- error(1, 0, "ipv4 parse error: %s", str_addr); -+ t_error(1, 0, "ipv4 parse error: %s", str_addr); - break; - case PF_INET6: - memset(addr6, 0, sizeof(*addr6)); -@@ -92,10 +109,10 @@ static void setup_sockaddr(int domain, const char *str_addr, - addr6->sin6_port = htons(cfg_port); - if (str_addr && - inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) != 1) -- error(1, 0, "ipv6 parse error: %s", str_addr); -+ t_error(1, 0, "ipv6 parse error: %s", str_addr); - break; - default: -- error(1, 0, "illegal domain"); -+ t_error(1, 0, "illegal domain"); - } - } - -@@ -105,12 +122,12 @@ static int do_setup_tx(int domain, int type, int protocol) - - fd = socket(domain, type, protocol); - if (fd == -1) -- error(1, errno, "socket t"); -+ t_error(1, errno, "socket t"); - - do_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 1 << 21); - - if (connect(fd, (void *) &cfg_dst_addr, cfg_alen)) -- error(1, errno, "connect"); -+ t_error(1, errno, "connect"); - return fd; - } - -@@ -125,7 +142,7 @@ static inline struct io_uring_cqe *wait_cqe_fast(struct io_uring *ring) - - ret = io_uring_wait_cqe(ring, &cqe); - if (ret) -- error(1, ret, "wait cqe"); -+ t_error(1, ret, "wait cqe"); - return cqe; - } - -@@ -143,17 +160,17 @@ static void do_tx(int domain, int type, int protocol) - - ret = io_uring_queue_init(512, &ring, IORING_SETUP_COOP_TASKRUN); - if (ret) -- error(1, ret, "io_uring: queue init"); -+ t_error(1, ret, "io_uring: queue init"); - - if (cfg_fixed_files) { - ret = io_uring_register_files(&ring, &fd, 1); - if (ret < 0) -- error(1, ret, "io_uring: files registration"); -+ t_error(1, ret, "io_uring: files registration"); - } - if (cfg_reg_ringfd) { - ret = io_uring_register_ring_fd(&ring); - if (ret < 0) -- error(1, ret, "io_uring: io_uring_register_ring_fd"); -+ t_error(1, ret, "io_uring: io_uring_register_ring_fd"); - } - - iov.iov_base = payload; -@@ -161,7 +178,7 @@ static void do_tx(int domain, int type, int protocol) - - ret = io_uring_register_buffers(&ring, &iov, 1); - if (ret) -- error(1, ret, "io_uring: buffer registration"); -+ t_error(1, ret, "io_uring: buffer registration"); - - tstop = gettimeofday_ms() + cfg_runtime_ms; - do { -@@ -193,14 +210,14 @@ static void do_tx(int domain, int type, int protocol) - - ret = io_uring_submit(&ring); - if (ret != cfg_nr_reqs) -- error(1, ret, "submit"); -+ t_error(1, ret, "submit"); - - for (i = 0; i < cfg_nr_reqs; i++) { - cqe = wait_cqe_fast(&ring); - - if (cqe->flags & IORING_CQE_F_NOTIF) { - if (cqe->flags & IORING_CQE_F_MORE) -- error(1, -EINVAL, "F_MORE notif"); -+ t_error(1, -EINVAL, "F_MORE notif"); - compl_cqes--; - i--; - io_uring_cqe_seen(&ring, cqe); -@@ -217,7 +234,7 @@ static void do_tx(int domain, int type, int protocol) - fprintf(stderr, "Connection failure"); - goto out_fail; - } else if (cqe->res != -EAGAIN) { -- error(1, cqe->res, "send failed"); -+ t_error(1, cqe->res, "send failed"); - } - io_uring_cqe_seen(&ring, cqe); - } -@@ -226,7 +243,7 @@ static void do_tx(int domain, int type, int protocol) - out_fail: - shutdown(fd, SHUT_RDWR); - if (close(fd)) -- error(1, errno, "close"); -+ t_error(1, errno, "close"); - - fprintf(stderr, "tx=%lu (MB=%lu), tx/s=%lu (MB/s=%lu)\n", - packets, bytes >> 20, -@@ -254,7 +271,7 @@ static void do_test(int domain, int type, int protocol) - - static void usage(const char *filepath) - { -- error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] " -+ t_error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] " - "(-4|-6) [-t<time s>] -D<dst_ip> udp", filepath); - } - -@@ -276,13 +293,13 @@ static void parse_opts(int argc, char **argv) - switch (c) { - case '4': - if (cfg_family != PF_UNSPEC) -- error(1, 0, "Pass one of -4 or -6"); -+ t_error(1, 0, "Pass one of -4 or -6"); - cfg_family = PF_INET; - cfg_alen = sizeof(struct sockaddr_in); - break; - case '6': - if (cfg_family != PF_UNSPEC) -- error(1, 0, "Pass one of -4 or -6"); -+ t_error(1, 0, "Pass one of -4 or -6"); - cfg_family = PF_INET6; - cfg_alen = sizeof(struct sockaddr_in6); - break; -@@ -311,9 +328,9 @@ static void parse_opts(int argc, char **argv) - } - - if (cfg_nr_reqs > MAX_SUBMIT_NR) -- error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR); -+ t_error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR); - if (cfg_payload_len > max_payload_len) -- error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); -+ t_error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); - - setup_sockaddr(cfg_family, daddr, &cfg_dst_addr); - -@@ -333,7 +350,7 @@ int main(int argc, char **argv) - else if (!strcmp(cfg_test, "udp")) - do_test(cfg_family, SOCK_DGRAM, 0); - else -- error(1, 0, "unknown cfg_test %s", cfg_test); -+ t_error(1, 0, "unknown cfg_test %s", cfg_test); - - return 0; - } --- -2.39.1 - diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index cfcf8ae3dd66..0f1757f4e618 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -1,45 +1,23 @@ -{ lib, stdenv, fetchgit -, fetchpatch -}: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.3"; + version = "2.4"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k="; + sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; }; - patches = [ - # Backported portability fixes from liburing master, needed for pkgsMusl.liburing - ./0001-Add-custom-error-function-for-tests.patch - ./0002-test-Use-t_error-instead-of-glibc-s-error.patch - ./0003-examples-Use-t_error-instead-of-glibc-s-error.patch - - # More portability fixes, in the process of being upstreamed - (fetchpatch { - url = "https://github.com/axboe/liburing/pull/798/commits/0fbcc44fe1fb2dc6807660b2cff1c2995add095b.patch"; - hash = "sha256-xOMsw0VpYGst/+Isd2Tmq8CmBDK+uyLw3KNKPnsCSoA="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. setOutputFlags = false; - preConfigure = - # We cannot use configureFlags or configureFlagsArray directly, since we - # don't have structuredAttrs yet and using placeholder causes permissions - # denied errors. Using $dev / $man in configureFlags causes bash evaluation - # errors - '' - configureFlagsArray+=( - "--includedir=$dev/include" - "--mandir=$man/share/man" - ) - ''; + configureFlags = [ + "--includedir=${placeholder "dev"}/include" + "--mandir=${placeholder "man"}/share/man" + ]; # Doesn't recognize platform flags configurePlatforms = []; @@ -61,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://git.kernel.dk/cgit/liburing/"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix index 28cbd8d8561c..5fa18444d0f4 100644 --- a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix @@ -9,19 +9,15 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2.0.2+date=2022-05-04"; + version = "2.0.2+date=2023-04-30"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a"; - hash = "sha256-41N5cSLAiPJ9FjdnCQnMvPu9/qhI3Je/M1VmKY+yII4="; + rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb"; + hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -32,6 +28,10 @@ stdenv.mkDerivation rec { libimobiledevice-glue ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + meta = with lib; { description = "A client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index 544ad5377291..113f83c1fc92 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -22,15 +22,15 @@ , python3 }: -stdenv.mkDerivation rec { - version = "1.45.0"; +stdenv.mkDerivation (finalAttrs: { + version = "1.46.0"; pname = "libuv"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qKw9QFR24Uw7pVA9isPH8Va+9/5DYuqXz6l6jWcXn+4="; + owner = "libuv"; + repo = "libuv"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; }; outputs = [ "out" "dev" ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "tcp_create_early" "tcp_close" "tcp_bind_error_inval" "tcp_bind_error_addrinuse" "tcp_shutdown_after_write" "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" - "multiple_listen" "delayed_accept" + "multiple_listen" "delayed_accept" "udp_recv_in_a_row" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "tty_pty" "condvar_5" "hrtime" "udp_multicast_join" # Tests that fail when sandboxing is enabled. @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; - in lib.optionalString doCheck '' + in lib.optionalString (finalAttrs.doCheck) '' sed '/${tdRegexp}/d' -i test/test-list.h ''; @@ -112,10 +112,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; - changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; + changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix index d7a7f43e7e80..7796ec251582 100644 --- a/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -1,36 +1,36 @@ { stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner , libdrm -, minimal ? false, libva-minimal +, minimal ? false , libX11, libXext, libXfixes, wayland, libffi, libGL , mesa # for passthru.tests , intel-compute-runtime , intel-media-driver , mpv -, vaapiIntel +, intel-vaapi-driver , vlc }: stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-VD+CTF0QLfzrUr4uFiyDlZux3MqsyyuJF/cXuhOFzwo="; + sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; }; outputs = [ "dev" "out" ]; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; + nativeBuildInputs = [ meson pkg-config ninja ] + ++ lib.optional (!minimal) wayland-scanner; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; - # TODO: share libs between minimal and !minimal - perhaps just symlink them + ++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ]; mesonFlags = [ # Add FHS and Debian paths for non-NixOS applications @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { passthru.tests = { # other drivers depending on libva and selected application users. # Please get a confirmation from the maintainer before adding more applications. - inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc; + inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libva/utils.nix b/nixpkgs/pkgs/development/libraries/libva/utils.nix index 5606dd57c07d..f0e4eab164d6 100644 --- a/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.18.2"; + version = "2.19.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-D7GPS/46jiIY8K0qPlMlYhmn+yWhTA+I6jAuxclNJSU="; + sha256 = "sha256-/juTlK7iRu8XN4kbB1VhmOcKjFD8iBwuIIAJsmF5ihU="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libvgm/default.nix b/nixpkgs/pkgs/development/libraries/libvgm/default.nix index e6f985225ef5..15b17d4cab36 100644 --- a/nixpkgs/pkgs/development/libraries/libvgm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2023-04-22"; + version = "unstable-2023-05-17"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "669a7566a356393d4e5b1030a9f9cdd3486bb41b"; - sha256 = "U/PO/YtS8bOb2yKk57UQKH4eRNysYC/hrmUR5YZyYlw="; + rev = "5ad95d6fb40261cebab3d142b5f0191ed4e3a7cd"; + sha256 = "R1PCinxUUoCpBWYXpbPCVNrl299ETIDovRbnAPFXMHM="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 5ed917b123a4..74e2d858a722 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "9.2.0"; + version = "9.4.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-uASIfQVbY/5I/PELEB6EGzzHfcgY4jIolbyH05TgiLA="; + sha256 = "sha256-aYLXiZtbNXwJ8qmTHXv2OnyrYWK7KbwQWulTeuTbe0k="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 55a08d59ed80..79b2e2ec2951 100644 --- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TkMy2tEdG1FPPWfH/wPnVbs5kocqe4Y0jU4yvbiRZ9k="; }; - sourceRoot = "source/libvmaf"; + sourceRoot = "${src.name}/libvmaf"; patches = [ # Backport fix for non-Linux, non-Darwin platforms. diff --git a/nixpkgs/pkgs/development/libraries/libvoikko/default.nix b/nixpkgs/pkgs/development/libraries/libvoikko/default.nix new file mode 100644 index 000000000000..3f5f4ef5c858 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libvoikko/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, autoreconfHook +, hfst-ospell +, fetchFromGitHub +, pkg-config +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libvoikko"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "voikko"; + repo = "corevoikko"; + rev = "refs/tags/rel-libvoikko-${finalAttrs.version}"; + hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M="; + }; + + sourceRoot = "${finalAttrs.src.name}/libvoikko"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + hfst-ospell + ]; + + meta = with lib; { + homepage = "https://voikko.puimula.org/"; + description = "Finnish language processing library"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index f1f6762bab8c..c03dd99a125b 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.6.0"; + version = "2.7.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-9zqW6zPrFcxv/yAAtFgdVavKVMXeDBoMP3E/XriUcT0="; + sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libwacom/surface.nix b/nixpkgs/pkgs/development/libraries/libwacom/surface.nix index 6168686cf50b..22707a375954 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/surface.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/surface.nix @@ -7,8 +7,8 @@ let libwacom-surface = fetchFromGitHub { owner = "linux-surface"; repo = "libwacom-surface"; - rev = "v2.6.0-1"; - hash = "sha256-4UOO9LMyCJd4LkqU0uva/0Xc44fIVdIQi27tJOtNEFk="; + rev = "v2.7.0-1"; + hash = "sha256-LgJ8YFQQN05kyd6kxBakIIiGgZ9icW27xKK3Dz6TwLs="; }; in libwacom.overrideAttrs (old: { pname = "libwacom-surface"; diff --git a/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix index 65fa55a787e1..39a7ab3ba45b 100644 --- a/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool -, fetchpatch , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp) , pngSupport ? true, libpng # PNG image format @@ -28,24 +27,15 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-nhXkq+qKpaa75YQB/W/cRozslTIFPdXeqj1y6emQeHk="; + hash = "sha256-Q94avvKjPdwdGt5ADo30cf2V4T7MCTubDHJxTtbG4xQ="; }; - patches = [ - # https://www.mozilla.org/en-US/security/advisories/mfsa2023-13/#MFSA-TMP-2023-0001 - (fetchpatch { - url = "https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch"; - name = "fix-msfa-tmp-2023-0001.patch"; - hash = "sha256-TRKXpNkYVzftBw09mX+WeQRhRoOzBgXFTNZBzSdCKvc="; - }) - ]; - configureFlags = [ (lib.enableFeature threadingSupport "threading") (lib.enableFeature openglSupport "gl") diff --git a/nixpkgs/pkgs/development/libraries/libwps/default.nix b/nixpkgs/pkgs/development/libraries/libwps/default.nix index fd62b9813435..f5af2e8284c8 100644 --- a/nixpkgs/pkgs/development/libraries/libwps/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libwps"; - version = "0.4.13"; + version = "0.4.14"; src = fetchurl { url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eVwva90EwLZgrMpRTcc2cAc9PG5wbXbV2GtK2BMpLrk="; + sha256 = "sha256-xVEdlAngO446F50EZcHMKW7aBvyDcTVu9Egs2oaIadE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 71dedb8346a5..2bda413a7326 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "6.2.0"; + version = "6.2.2"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - hash = "sha256-VILqlvACQyccaXXS+UE25+LzE74+52pI66RUrVS0esI="; + hash = "sha256-JYhuyW95I7Q0edLIe7H//+ej5vh6MdAGxXjmNxDMuhQ="; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix index 97ca6870496e..d45155e80029 100644 --- a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxcrypt"; - version = "4.4.33"; + version = "4.4.36"; src = fetchurl { url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz"; - hash = "sha256-6HrPnGUsVzpHE9VYIVn5jzBdVu1fdUzmT1fUGU1rOm8="; + hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; }; outputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-hashes=${enableHashes}" "--enable-obsolete-api=glibc" "--disable-failure-tokens" - ] ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.libc == "bionic") [ + # required for musl, android, march=native "--disable-werror" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; enabledCryptSchemeIds = [ - # https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf + # https://github.com/besser82/libxcrypt/blob/v4.4.35/lib/hashes.conf "y" # yescrypt "gy" # gost_yescrypt "7" # scrypt @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { + changelog = "https://github.com/besser82/libxcrypt/blob/v${finalAttrs.version}/NEWS"; description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; homepage = "https://github.com/besser82/libxcrypt/"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix index 77047e9099d2..7786ec7908ff 100644 --- a/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix @@ -1,26 +1,29 @@ -{lib, stdenv, fetchurl, fetchpatch}: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "libxdg-basedir"; - version = "1.2.0"; + version = "1.2.3"; - src = fetchurl { - url = "https://nevill.ch/libxdg-basedir/downloads/libxdg-basedir-${version}.tar.gz"; - sha256 = "2757a949618742d80ac59ee2f0d946adc6e71576406cdf798e6ced507708cdf4"; + src = fetchFromGitHub { + owner = "devnev"; + repo = pname; + rev = "refs/tags/libxdg-basedir-${version}"; + hash = "sha256-ewtUKDdE6k9Q9hglWwhbTU3DTxvIN41t+zf2Gch9Dkk="; }; - patches = [ - # Overflow bug - (fetchpatch { - url = "https://github.com/devnev/libxdg-basedir/commit/14e000f696ef8b83264b0ca4407669bdb365fb23.patch"; - sha256 = "0lpy1ijir0x0hhb0fz0w5vxy1wl1cw9kkd6gva0rkp41i6vrp2wq"; - }) + nativeBuildInputs = [ + autoreconfHook ]; meta = with lib; { - homepage = "https://github.com/devnev/libxdg-basedir"; description = "Implementation of the XDG Base Directory specification"; + homepage = "https://github.com/devnev/libxdg-basedir"; license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix index 5d9b50e7251c..3716090a30d7 100644 --- a/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { "USE_SYSTEM_MINIZIP=1" ]; + # TEST 428/429 worksheet:worksheet_table15 *** buffer overflow detected ***: terminated + hardeningDisable = [ "fortify3" ]; + doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index a5eafa0fdecb..d670f8e96984 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -34,7 +34,7 @@ in let libxml = stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.10.4"; + version = "2.11.4"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" @@ -43,24 +43,9 @@ libxml = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - sha256 = "7QyRxYRQCPGTZznk7uIDVTHByUdCxlQfRO5m2IWUjUU="; + sha256 = "c34df4qz8TlynKE6JJT9F78w3bS3pCfPM2JSyrV/V/c="; }; - patches = [ - # Upstream bugs: - # https://bugzilla.gnome.org/show_bug.cgi?id=789714 - # https://gitlab.gnome.org/GNOME/libxml2/issues/64 - # Patch from https://bugzilla.opensuse.org/show_bug.cgi?id=1065270 , - # but only the UTF-8 part. - # Can also be mitigated by fixing malformed XML inputs, such as in - # https://gitlab.gnome.org/GNOME/gnumeric/merge_requests/3 . - # Other discussion: - # https://github.com/itstool/itstool/issues/22 - # https://github.com/NixOS/nixpkgs/pull/63174 - # https://github.com/NixOS/nixpkgs/pull/72342 - ./utf8-xmlErrorFuncHandler.patch - ]; - strictDeps = true; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch b/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch deleted file mode 100644 index 9f4c99b09341..000000000000 --- a/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: libxml2-2.9.5/python/libxml.c -=================================================================== ---- libxml2-2.9.5.orig/python/libxml.c -+++ libxml2-2.9.5/python/libxml.c -@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU - PyObject *message; - PyObject *result; - char str[1000]; -+ unsigned char *ptr = (unsigned char *)str; - - #ifdef DEBUG_ERROR - printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); -@@ -1636,10 +1637,16 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU - str[999] = 0; - va_end(ap); - -+#if PY_MAJOR_VERSION >= 3 -+ /* Ensure the error string doesn't start at UTF8 continuation. */ -+ while (*ptr && (*ptr & 0xc0) == 0x80) -+ ptr++; -+#endif -+ - list = PyTuple_New(2); - PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); - Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); -- message = libxml_charPtrConstWrap(str); -+ message = libxml_charPtrConstWrap(ptr); - PyTuple_SetItem(list, 1, message); - result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); - Py_XDECREF(list); diff --git a/nixpkgs/pkgs/development/libraries/libxmp/default.nix b/nixpkgs/pkgs/development/libraries/libxmp/default.nix index 7fc14677ed7f..1cd4e5aa03a9 100644 --- a/nixpkgs/pkgs/development/libraries/libxmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libxmp"; - version = "4.5.0"; + version = "4.6.0"; meta = with lib; { description = "Extended module player library"; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz"; - sha256 = "sha256-eEfSYhEtFOhEL0TlrG7Z3bylTCUShHILVjyFKzHybnU="; + sha256 = "sha256-LTxF/lI7UJB+ieYPmjt/TMmquD7J27p3Q+r/vNyzXqY="; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix index 054e0c4b9fda..3a5c89557459 100644 --- a/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.37"; + version = "1.1.38"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Oksn3IAnzNYUZyWVAzbx7FIJKPMg8UTrX6eZCuYSOrQ="; + sha256 = "HzJFBCWBmgmsr/Krelp/ii7HlW5QXXvutF6EPQ4eyrE="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/libytnef/default.nix b/nixpkgs/pkgs/development/libraries/libytnef/default.nix index 59d4a8ce09ec..43734b19b890 100644 --- a/nixpkgs/pkgs/development/libraries/libytnef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libytnef/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libytnef"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "sha256-VlgvbU8yNHyVRKqaNqqCpLBsndltfAk33BuzvFuViqU="; + hash = "sha256-kQb45Da0T7wWi1IivA8Whk+ECL2nyFf7Gc0gK1HKj2c="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libzim/default.nix b/nixpkgs/pkgs/development/libraries/libzim/default.nix index 0f2ad8406376..f9bcdeb933b0 100644 --- a/nixpkgs/pkgs/development/libraries/libzim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzim/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Xh1SQNmG4lQ3f/g+i5m36LJO9JlPzP4bNqhyyKT7NEA="; + hash = "sha256-bhztigbiIGdVxBV5cpuHuuRGBN5UgC39w51uwLEq47w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix index 6ba8eaf6f170..3b71167cdec1 100644 --- a/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.9.2"; + version = "1.10.0"; src = fetchurl { url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; + sha256 = "sha256-UqYLRhglh+CDtx4rgvyqumTdXrAcWx8bxxBpo4WOQP4="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/nixpkgs/pkgs/development/libraries/lightgbm/default.nix index 7ac716b326dd..25cb21a314ce 100644 --- a/nixpkgs/pkgs/development/libraries/lightgbm/default.nix +++ b/nixpkgs/pkgs/development/libraries/lightgbm/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true -, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false +, cudaSupport ? config.cudaSupport, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false , rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }: assert doCheck -> mpiSupport != true; diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index 0f650e7474ff..6367b93b1a21 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { "--enable-sage" ]; + # https://github.com/linbox-team/linbox/issues/304 + hardeningDisable = [ "fortify3" ]; + doCheck = true; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix index 094800fcc00e..6667aa4882e0 100644 --- a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; rev = "v${version}"; - sha256 = "sha256-EvCxBwzpi3riSBhlHr6MmIUYKTCp02y5gz7pDJCEC1Q="; + sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; }; configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; diff --git a/nixpkgs/pkgs/development/libraries/llhttp/default.nix b/nixpkgs/pkgs/development/libraries/llhttp/default.nix index 90f274c9e560..cba1ddcf2fc3 100644 --- a/nixpkgs/pkgs/development/libraries/llhttp/default.nix +++ b/nixpkgs/pkgs/development/libraries/llhttp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "llhttp"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; rev = "release/v${version}"; - hash = "sha256-pBGjcT5MiCSJI12TiH1XH5eAzIeylCdP/82L3o38BJo="; + hash = "sha256-srAHKyYvdEGtjV7BwcKQArwAChRoZqTCfa/RefI/8wQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix index a186f2993a46..21f07337fab4 100644 --- a/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/lmdb/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.30"; + version = "0.9.31"; src = fetchFromGitLab { domain = "git.openldap.org"; owner = "openldap"; repo = "openldap"; rev = "LMDB_${version}"; - sha256 = "sha256-zLa9BtSPzujHAIZKDl69lTo72cI3m/GZejFw5v8bFsg="; + sha256 = "sha256-SBbo7MX3NST+OFPDtQshevIYrIsZD9bOkSsH91inMBw="; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index fb5409a7e727..d1a8c4887249 100644 --- a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: +{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib, darwin }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; - patches = [ - ]; - configureFlags = [ "--with-ssl=openssl" ]; propagatedBuildInputs = [ openssl libidn glib zlib ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Foundation + ]; + meta = with lib; { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch b/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch index ef42650e249d..24effe9dde04 100644 --- a/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch +++ b/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch @@ -1,4 +1,4 @@ -commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f +commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5 Author: Jan Tojnar <jtojnar@gmail.com> Date: Thu Jul 23 18:49:03 2020 +0200 @@ -22,7 +22,7 @@ Date: Thu Jul 23 18:49:03 2020 +0200 https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946 diff --git a/meson.build b/meson.build -index 6e1dfa5..196350b 100644 +index 038dd35..e3c77f0 100644 --- a/meson.build +++ b/meson.build @@ -123,9 +123,8 @@ test_env = [ @@ -36,8 +36,8 @@ index 6e1dfa5..196350b 100644 subdir('libmalcontent') else libmalcontent_api_version = '0' -@@ -136,11 +135,16 @@ endif - if get_option('ui').enabled() +@@ -143,14 +142,19 @@ if get_option('ui').enabled() + ) subdir('libmalcontent-ui') endif -subdir('malcontent-client') @@ -47,12 +47,15 @@ index 6e1dfa5..196350b 100644 if get_option('ui').enabled() subdir('malcontent-control') + subdir('help') -+endif -+if not get_option('use_system_libmalcontent') -+ subdir('pam') -+ subdir('po') + + gnome.post_install( + gtk_update_icon_cache: true, + update_desktop_database: true, + ) endif -subdir('pam') -subdir('po') - - meson.add_install_script('build-aux/meson_post_install.py') ++if not get_option('use_system_libmalcontent') ++ subdir('pam') ++ subdir('po') ++endif diff --git a/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/nixpkgs/pkgs/development/libraries/malcontent/default.nix index 92ec23542883..d897230f8f37 100644 --- a/nixpkgs/pkgs/development/libraries/malcontent/default.nix +++ b/nixpkgs/pkgs/development/libraries/malcontent/default.nix @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.11.0"; + version = "0.11.1"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pwithnall"; - repo = pname; + repo = "malcontent"; rev = version; - sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA="; + hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix index 8969d1e13428..59950a75c745 100644 --- a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix +++ b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix @@ -66,12 +66,6 @@ stdenv.mkDerivation rec { "-Dui=enabled" ]; - postPatch = '' - # https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148 - substituteInPlace build-aux/meson_post_install.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - meta = with lib; { description = "UI components for parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; diff --git a/nixpkgs/pkgs/development/libraries/maui-core/default.nix b/nixpkgs/pkgs/development/libraries/maui-core/default.nix index 8d6a81b93ffd..b173498189d6 100644 --- a/nixpkgs/pkgs/development/libraries/maui-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/maui-core/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "maui-core"; - version = "0.5.6"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Nitrux"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-58ja76N7LrJ0f/SsNMYr7Z9hdW60PwsNlTkHQ+NEdUM="; + sha256 = "sha256-o0Xwh9w0cClMw85FwpQB9CNWoSnzARxs6aGfvCA4BhA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/2.nix b/nixpkgs/pkgs/development/libraries/mbedtls/2.nix index 2dd5ae6dae58..3711e2d2b4ff 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/2.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.3"; - hash = "sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw="; + version = "2.28.4"; + hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; } diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/3.nix b/nixpkgs/pkgs/development/libraries/mbedtls/3.nix index 67269717bb99..01df03bbbadb 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/3.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.4.0"; - hash = "sha256-1YA4hp/VEjph5k0qJqhhH4nBbTP3Qu2pl7WpuvPkVfg="; + version = "3.4.1"; + hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; } diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix b/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix index adc46adb75fb..3ca0b491fb89 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/generic.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { "-DGEN_FILES=off" ]; + doCheck = true; + + # Parallel checking causes test failures + # https://github.com/Mbed-TLS/mbedtls/issues/4980 + enableParallelChecking = false; + meta = with lib; { homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 0a0d5b47b9a0..75649eabaede 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -30,6 +30,7 @@ ] ++ lib.optionals stdenv.hostPlatform.isx86 [ "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 "crocus" # Intel legacy, x86 only + "i915" # Intel extra legacy, x86 only ] else [ "auto" ] , vulkanDrivers ? @@ -85,8 +86,8 @@ */ let - version = "23.1.2"; - hash = "sha256-YLHzrbFWGDDBWL88aFCJQ2dPudafOEw8colpQ4WrXH4="; + version = "23.1.3"; + hash = "sha256-L21zgbwQ+9LWJjrRAieFuLURBGwakEFi+PfaGO6ortk="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -210,6 +211,8 @@ self = stdenv.mkDerivation { # Rusticl, new OpenCL frontend "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" + ] ++ lib.optionals (!withValgrind) [ + "-Dvalgrind=disabled" ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; diff --git a/nixpkgs/pkgs/development/libraries/migraphx/default.nix b/nixpkgs/pkgs/development/libraries/migraphx/default.nix index fc4ccec94ad6..0cee9c3e42f6 100644 --- a/nixpkgs/pkgs/development/libraries/migraphx/default.nix +++ b/nixpkgs/pkgs/development/libraries/migraphx/default.nix @@ -17,7 +17,7 @@ , nlohmann_json , msgpack , sqlite -, oneDNN +, oneDNN_2 , blaze , texlive , doxygen @@ -91,7 +91,7 @@ in stdenv.mkDerivation (finalAttrs: { nlohmann_json msgpack sqlite - oneDNN + oneDNN_2 blaze python3Packages.pybind11 python3Packages.onnx diff --git a/nixpkgs/pkgs/development/libraries/miniaudio/default.nix b/nixpkgs/pkgs/development/libraries/miniaudio/default.nix index ba5b60b23c45..f49a17a67f93 100644 --- a/nixpkgs/pkgs/development/libraries/miniaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.16"; + version = "0.11.17"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; + hash = "sha256-nPQ53+9CDEn91LZgF5RkVur+XckTDcS38FHomPXbtMI="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index 9f76e213c56f..385b5707754f 100644 --- a/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "3.0.10"; + version = "4.0.0"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg="; + sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "-DMZ_OPENSSL=ON" "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMZ_LIB_SUFFIX='-ng'" ] ++ lib.optionals stdenv.isDarwin [ # missing header file "-DMZ_LIBCOMP=OFF" diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index f57ac10468b7..a13b3655066b 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -1,65 +1,135 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif -, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, gitUpdater, libebur128, rubberband -, jack2, ladspa-sdk, swig, which, ncurses -, enablePython ? false, python3 +{ config +, lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, which +, ffmpeg +, fftw +, frei0r +, libdv +, libjack2 +, libsamplerate +, libvorbis +, libxml2 +, makeWrapper +, movit +, opencv4 +, rtaudio +, rubberband +, sox +, vid-stab +, darwin +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } +, enableJackrack ? stdenv.isLinux +, ladspa-sdk +, ladspaPlugins +, enablePython ? false +, python3 +, swig +, enableQt ? false +, libsForQt5 +, enableSDL1 ? stdenv.isLinux +, SDL +, enableSDL2 ? true +, SDL2 +, gitUpdater }: stdenv.mkDerivation rec { pname = "mlt"; - version = "6.26.0"; + version = "7.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "FPXROiX7A6oB1VMipw3slyhk7q4fO6m9amohnC67lnA="; + hash = "sha256-3qvMuBr2w/gedTDIjG6ezatleXuQSnKX4SkBShzj6aw="; }; - buildInputs = [ - SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev - movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 - ladspa-sdk rubberband - ] ++ lib.optional enablePython ncurses; + nativeBuildInputs = [ + cmake + pkg-config + which + makeWrapper + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ] ++ lib.optionals enablePython [ + python3 + swig + ] ++ lib.optionals enableQt [ + libsForQt5.wrapQtAppsHook + ]; - nativeBuildInputs = [ pkg-config makeWrapper which ] - ++ lib.optionals enablePython [ python3 swig ]; + buildInputs = [ + ffmpeg + fftw + frei0r + libdv + libjack2 + libsamplerate + libvorbis + libxml2 + movit + opencv4 + rtaudio + rubberband + sox + vid-stab + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Accelerate + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ] ++ lib.optionals enableJackrack [ + ladspa-sdk + ladspaPlugins + ] ++ lib.optionals enableQt [ + libsForQt5.qtbase + libsForQt5.qtsvg + ] ++ lib.optionals enableSDL1 [ + SDL + ] ++ lib.optionals enableSDL2 [ + SDL2 + ]; - strictDeps = true; + outputs = [ "out" "dev" ]; - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" - ] ++ lib.optional enablePython "--swig-languages=python"; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DMOD_OPENCV=ON" + ] ++ lib.optionals enablePython [ + "-DSWIG_PYTHON=ON" + ]; - enableParallelBuilding = true; - outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)"; + preFixup = '' + wrapProgram $out/bin/melt \ + --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 \ + ${lib.optionalString enableJackrack "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"} \ + ${lib.optionalString enableQt "\${qtWrapperArgs[@]}"} - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; - # Remove an unnecessary reference to movit.dev. - s=${movit.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" - '' + lib.optionalString enablePython '' - mkdir -p ${outPythonPath}/mlt - cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/ - cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py - sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ + --replace '=''${prefix}//' '=/' ''; + passthru = { + inherit ffmpeg; + }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = "https://www.mltframework.org"; - license = with licenses; [ gpl3Only gpl2Only lgpl21Only ]; - maintainers = with maintainers; [ peti ]; - platforms = platforms.linux; + homepage = "https://www.mltframework.org/"; + license = with licenses; [ lgpl21Plus gpl2Plus ]; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix deleted file mode 100644 index e993cfcf8ded..000000000000 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, fetchFromGitHub -, cmake -, SDL -, ffmpeg -, frei0r -, libjack2 -, libdv -, libsamplerate -, libvorbis -, libxml2 -, movit -, pkg-config -, sox -, qtbase -, qtsvg -, fftw -, vid-stab -, opencv4 -, ladspa-sdk -, gitUpdater -, ladspaPlugins -, rubberband -, mkDerivation -, which -}: - -mkDerivation rec { - pname = "mlt"; - version = "7.16.0"; - - src = fetchFromGitHub { - owner = "mltframework"; - repo = "mlt"; - rev = "v${version}"; - sha256 = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik="; - }; - - buildInputs = [ - SDL - ffmpeg - frei0r - libjack2 - libdv - libsamplerate - libvorbis - libxml2 - movit - qtbase - qtsvg - sox - fftw - vid-stab - opencv4 - ladspa-sdk - ladspaPlugins - rubberband - ]; - - nativeBuildInputs = [ cmake which pkg-config ]; - - outputs = [ "out" "dev" ]; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DMOD_OPENCV=ON" - ]; - - qtWrapperArgs = [ - "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" - ]; - - postFixup = '' - substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ - --replace '=''${prefix}//' '=/' - ''; - - passthru = { - inherit ffmpeg; - }; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Open source multimedia framework, designed for television broadcasting"; - homepage = "https://www.mltframework.org/"; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix index 10b25e1265c9..0e8e5cb8771f 100644 --- a/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.4"; + version = "1.24.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-jYEEWbm00V3zhzxH8jBkrj/+OC6CGjbh5qofNYmsdTk="; + hash = "sha256-gey+/DAfAK69f5q568giLNL4R1UqGD6eiImkjyvnZys="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cyrus_sasl snappy ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk_11_0.frameworks.Security ]; cmakeFlags = [ @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/mongocxx/default.nix b/nixpkgs/pkgs/development/libraries/mongocxx/default.nix new file mode 100644 index 000000000000..ef6134c3e497 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mongocxx/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, mongoc +, cmake +, validatePkgConfig +, testers +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mongocxx"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = "mongo-cxx-driver"; + rev = "refs/tags/r${finalAttrs.version}"; + hash = "sha256-7pMVBWMIGV6k04/0rKULwNcl0NMO4hqMnOzWv+0/DrA="; + }; + + postPatch = '' + substituteInPlace src/bsoncxx/config/CMakeLists.txt \ + src/mongocxx/config/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; + + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + + buildInputs = [ + mongoc + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=20" + "-DBUILD_VERSION=${finalAttrs.version}" + "-DENABLE_UNINSTALL=OFF" + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "The official C++ client library for MongoDB"; + homepage = "http://mongocxx.org"; + license = licenses.asl20; + maintainers = with maintainers; [ adriandole ]; + pkgConfigModules = [ "libmongocxx" "libbsoncxx" ]; + platforms = platforms.all; + badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14 + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/movit/default.nix b/nixpkgs/pkgs/development/libraries/movit/default.nix index de69bd730d25..4601e04f03c9 100644 --- a/nixpkgs/pkgs/development/libraries/movit/default.nix +++ b/nixpkgs/pkgs/development/libraries/movit/default.nix @@ -1,22 +1,49 @@ -{ lib, stdenv, fetchurl, SDL2, eigen, libepoxy, fftw, gtest, pkg-config }: +{ lib +, stdenv +, fetchurl +, pkg-config +, SDL2 +, fftw +, gtest +, darwin +, eigen +, libepoxy +}: stdenv.mkDerivation rec { pname = "movit"; - version = "1.6.3"; + version = "1.7.1"; src = fetchurl { url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; - sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; + sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo="; }; outputs = [ "out" "dev" ]; GTEST_DIR = "${gtest.src}/googletest"; - propagatedBuildInputs = [ eigen libepoxy ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 fftw gtest ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL2 + fftw + gtest + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.OpenGL + darwin.libobjc + ]; + + propagatedBuildInputs = [ + eigen + libepoxy + ]; + + env = lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-framework OpenGL"; + }; enableParallelBuilding = true; @@ -25,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix new file mode 100644 index 000000000000..fca89f8d0f68 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mqtt_cpp"; + version = "13.2.1"; + + src = fetchFromGitHub { + owner = "redboltz"; + repo = "mqtt_cpp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-E5dMZ0uJ1AOwiGTxD4qhbO72blplmXHh1gTYGE34H+0="; + }; + + nativeBuildInputs = [cmake]; + + buildInputs = [boost]; + + meta = with lib; { + description = "MQTT client/server for C++14 based on Boost.Asio"; + homepage = "https://github.com/redboltz/mqtt_cpp"; + license = licenses.boost; + maintainers = with maintainers; [spalf]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix new file mode 100644 index 000000000000..fed8cee33231 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "msgpack-c"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "refs/tags/c-${finalAttrs.version}"; + hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built + ] ++ lib.optional (!finalAttrs.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + + checkInputs = [ + gtest + zlib + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "MessagePack implementation for C"; + homepage = "https://github.com/msgpack/msgpack-c"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ nickcao ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix b/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix new file mode 100644 index 000000000000..198593df5018 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "msgpack-cxx"; + version = "6.1.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "refs/tags/cpp-${finalAttrs.version}"; + hash = "sha256-VqzFmm3MmMhWyooOsz1d9gwwbn/fnnxpkCFwqKR6los="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + ]; + + cmakeFlags = [ + "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built + ] ++ lib.optional finalAttrs.doCheck "-DMSGPACK_BUILD_TESTS=ON"; + + checkInputs = [ + zlib + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "MessagePack implementation for C++"; + homepage = "https://github.com/msgpack/msgpack-c"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ nickcao ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/mutest/default.nix b/nixpkgs/pkgs/development/libraries/mutest/default.nix index f2d3a5595530..f8e02b65774c 100644 --- a/nixpkgs/pkgs/development/libraries/mutest/default.nix +++ b/nixpkgs/pkgs/development/libraries/mutest/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , meson , ninja +, unstableGitUpdater }: stdenv.mkDerivation { pname = "mutest"; - version = "unstable-2019-08-26"; + version = "0-unstable-2023-02-24"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "ebassi"; repo = "mutest"; - rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a"; - sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q"; + rev = "18a20071773f7c4b75e82a931ef9b916b273b3e5"; + sha256 = "z0kASte0/I48Fgxhblu24MjGHidWomhfFOhfStGtPn4="; }; nativeBuildInputs = [ @@ -24,8 +26,12 @@ stdenv.mkDerivation { doCheck = true; + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = with lib; { - homepage = "https://ebassi.github.io/mutest/mutest.md.html"; + homepage = "https://github.com/ebassi/mutest"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; diff --git a/nixpkgs/pkgs/development/libraries/mygui/default.nix b/nixpkgs/pkgs/development/libraries/mygui/default.nix index 4cb475b9a0af..c785e640ccb0 100644 --- a/nixpkgs/pkgs/development/libraries/mygui/default.nix +++ b/nixpkgs/pkgs/development/libraries/mygui/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "mygui"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "MyGUI"; repo = "mygui"; rev = "MyGUI${version}"; - hash = "sha256-5u9whibYKPj8tCuhdLOhL4nDisbFAB0NxxdjU/8izb8="; + hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/mygui/disable-framework.patch b/nixpkgs/pkgs/development/libraries/mygui/disable-framework.patch index 502e58ac3625..d497c862ac8a 100644 --- a/nixpkgs/pkgs/development/libraries/mygui/disable-framework.patch +++ b/nixpkgs/pkgs/development/libraries/mygui/disable-framework.patch @@ -1,8 +1,8 @@ diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake -index bba3f91..8f4f351 100644 +index 7e279c986..b33f097c0 100644 --- a/CMake/Utils/MyGUIConfigTargets.cmake +++ b/CMake/Utils/MyGUIConfigTargets.cmake -@@ -477,14 +477,6 @@ function(mygui_config_lib PROJECTNAME) +@@ -418,15 +418,6 @@ function(mygui_config_lib PROJECTNAME) if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") # add GCC visibility flags to shared library build set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}") @@ -12,7 +12,8 @@ index bba3f91..8f4f351 100644 - set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}") - set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME}) - set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../Frameworks") +- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE) +- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib") - endif (APPLE) endif () endif (MYGUI_STATIC) diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix index 36208fc09a81..1fa8a216e4dd 100644 --- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix @@ -1,20 +1,25 @@ -{lib, stdenv, fetchFromGitHub, cmake}: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, buildExamples ? false +}: -stdenv.mkDerivation rec { - version = "1.4.3"; +stdenv.mkDerivation (finalAttrs: { + version = "1.5.0"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; - rev = "v${version}"; - sha256 = "sha256-NcewcNQcI1CjMNibRF9HCoE2Ibs0/Hy4eOkJ20W3wLo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-vPLL6l4sFRi7nvIfdMbBn/gvQ1+1lQHlZbR/2ok0Iw8="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" + "-DBUILD_EXAMPLES=${if buildExamples then "ON" else "OFF"}" ]; doCheck = true; @@ -22,8 +27,22 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jlblancoc/nanoflann"; - license = lib.licenses.bsd2; description = "Header only C++ library for approximate nearest neighbor search"; + longDescription = '' + nanoflann is a C++11 header-only library for building KD-Trees of datasets + with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and + 3D rotation groups). No support for approximate NN is provided. nanoflann + does not require compiling or installing. You just need to #include + <nanoflann.hpp> in your code. + + This library is a fork of the flann library by Marius Muja and David + G. Lowe, and born as a child project of MRPT. Following the original + license terms, nanoflann is distributed under the BSD license. Please, for + bugs use the issues button or fork and open a pull request. + ''; + changelog = "https://github.com/jlblancoc/nanoflann/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/nanosvg/default.nix b/nixpkgs/pkgs/development/libraries/nanosvg/default.nix new file mode 100644 index 000000000000..2033069d77e2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nanosvg/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation { + pname = "nanosvg"; + version = "unstable-2022-12-04"; + + src = fetchFromGitHub { + owner = "memononen"; + repo = "nanosvg"; + rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; + hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Simple stupid SVG parser"; + homepage = "https://github.com/memononen/nanosvg"; + license = licenses.zlib; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/nixpkgs/pkgs/development/libraries/ncurses/default.nix index c79f1c908993..cb8333704ff1 100644 --- a/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -139,6 +139,13 @@ stdenv.mkDerivation (finalAttrs: { done done + # add pkg-config aliases for libraries that are built-in to libncurses(w) + for library in tinfo tic; do + for suffix in "" w; do + ln -svf ncurses$suffix.pc $dev/lib/pkgconfig/$library$suffix.pc + done + done + # move some utilities to $bin # these programs are used at runtime and don't really belong in $dev moveToOutput "bin/clear" "$out" diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix index 1c15455b6add..9cd0d186302b 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ avahi ]; unpackPhase = '' - unpackFile ${src} + unpackFile $src echo y | ./${installerName}.sh sourceRoot="NDI SDK for Linux"; ''; diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index c7977ed89d99..d7b31426c4f6 100644 --- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,7 +6,7 @@ , python3 , python3Packages , wafHook -, boost +, boost179 , openssl , sqlite }: @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - buildInputs = [ boost openssl sqlite ]; + buildInputs = [ boost179 openssl sqlite ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" + "--boost-includes=${boost179.dev}/include" + "--boost-libs=${boost179.out}/lib" "--with-tests" ]; diff --git a/nixpkgs/pkgs/development/libraries/nettle/default.nix b/nixpkgs/pkgs/development/libraries/nettle/default.nix index ba133320da57..3a1297f89763 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/default.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.9"; + version = "3.9.1"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - hash = "sha256-Duet9acgFhC7f+Csu3ybO+g75EkE3TXrvNllzYlr/qo="; + hash = "sha256-zP7/mBsMpxu9b7ywVPQHxg/7ZEOJpb6A1nFtW1UMbOM="; }; } diff --git a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 38e996330e71..05b51d73b8d1 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-fZMFSQ8RCVxuoLrisa8lLqjNVe4fIuGqbyKtkC/u02M="; + hash = "sha256-ypoq+wXBaA5p5ZjRC8SNn9jHcMHHLJZLDLNOFMoua0g="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix index e801a9c0ee55..23cac5f0cfe9 100644 --- a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "10.0.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY="; + hash = "sha256-sJL8g+UVFvJTqujS9F6gy8tairYUztHCSILkQlwDADU"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 3c8244c75532..29c7ca2c690b 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake }: let @@ -21,6 +22,24 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; }; + patches = [ + # Backport fix for gcc-13: + # https://github.com/nlohmann/json/pull/3895 + (fetchpatch { + name = "gcc-13-rebind.patch"; + url = "https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch"; + hash = "sha256-Jbi0VwZP+ZHTGbpIwgKCVc66gOmwjkT5iOUe85eIzM0="; + }) + + # Backport fix for gcc-13: + # https://github.com/nlohmann/json/pull/3950 + (fetchpatch { + name = "gcc-13-eq-op.patch"; + url = "https://github.com/nlohmann/json/commit/a49829bd984c0282be18fcec070df0c31bf77dd5.patch"; + hash = "sha256-D+cRtdN6AXr4z3/y9Ui7Zqp3e/y10tp+DOL80ZtPz5E="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/nng/default.nix b/nixpkgs/pkgs/development/libraries/nng/default.nix index d7b021e7c494..65ba691e1205 100644 --- a/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "539e559e65cd8f227c45e4b046ac41c0edcf6c32"; - sha256 = "sha256-86+f0um25Ywn78S2JrV54K7k3O6ots0q2dCco1aK0xM="; + rev = "8e1836f57e8bcdb228dd5baadc71dfbf30b544e0"; + sha256 = "sha256-Q08/Oxv9DLCHp7Hf3NqNa0sHq7qwM6TfGT8gNyiwin8="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/nixpkgs/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix index 7aa0b485bed0..7d8877c79ad1 100644 --- a/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102; + inherit (nixosTests) firefox firefox-esr-102 firefox-esr-115; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/nss/85_security_load_3.77+.patch b/nixpkgs/pkgs/development/libraries/nss/85_security_load_3.77+.patch deleted file mode 100644 index bae86c9d26ad..000000000000 --- a/nixpkgs/pkgs/development/libraries/nss/85_security_load_3.77+.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c -index ad8f3b84e..74676d039 100644 ---- nss/cmd/shlibsign/shlibsign.c -+++ nss/cmd/shlibsign/shlibsign.c -@@ -875,6 +875,8 @@ main(int argc, char **argv) - goto cleanup; - } - lib = PR_LoadLibrary(libname); -+ if (!lib) -+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so"); - assert(lib != NULL); - if (!lib) { - PR_fprintf(PR_STDERR, "loading softokn3 failed"); -diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c -index 119c8c512..720d39ccc 100644 ---- nss/lib/pk11wrap/pk11load.c -+++ nss/lib/pk11wrap/pk11load.c -@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) - #else - library = PR_LoadLibrary(mod->dllName); - #endif // defined(_WIN32) -+#ifndef NSS_STATIC_SOFTOKEN -+ if ((library == NULL) && -+ !rindex(mod->dllName, PR_GetDirectorySeparator())) { -+ library = PORT_LoadLibraryFromOrigin(my_shlib_name, -+ (PRFuncPtr) &softoken_LoadDSO, -+ mod->dllName); -+ } -+#endif -+ - mod->library = (void *)library; - - if (library == NULL) { -diff --git nss/lib/util/secload.c nss/lib/util/secload.c -index 12efd2f75..8b74478f6 100644 ---- nss/lib/util/secload.c -+++ nss/lib/util/secload.c -@@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) - - /* Remove the trailing filename from referencePath and add the new one */ - c = strrchr(referencePath, PR_GetDirectorySeparator()); -+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] -+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ -+ referencePath = NIX_NSS_LIBDIR; -+ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ -+ } - if (c) { - size_t referencePathSize = 1 + c - referencePath; -- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); -+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); - if (fullName) { - memcpy(fullName, referencePath, referencePathSize); - strcpy(fullName + referencePathSize, name); -@@ -82,6 +87,11 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) - #endif - libSpec.type = PR_LibSpec_Pathname; - libSpec.value.pathname = fullName; -+ if ((referencePathSize >= 4) && -+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { -+ memcpy(fullName + referencePathSize -4, "lib", 3); -+ } -+ strcpy(fullName + referencePathSize, name); - dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL - #ifdef PR_LD_ALT_SEARCH_PATH - /* allow library's dependencies to be found in the same directory -@@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) - | PR_LD_ALT_SEARCH_PATH - #endif - ); -+ if (! dlh) { -+ strcpy(fullName + referencePathSize, name); -+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); -+ } - PORT_Free(fullName); - } - } diff --git a/nixpkgs/pkgs/development/libraries/nss/esr.nix b/nixpkgs/pkgs/development/libraries/nss/esr.nix index d9103f75399a..fe3cc87192af 100644 --- a/nixpkgs/pkgs/development/libraries/nss/esr.nix +++ b/nixpkgs/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.79.4"; - hash = "sha256-Skcdv6Wzo7fsB4U8b8CijNBmn2mEEp4k9VQeLOFdcdU="; + version = "3.90"; + hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; } diff --git a/nixpkgs/pkgs/development/libraries/nss/gcc-13-esr.patch b/nixpkgs/pkgs/development/libraries/nss/gcc-13-esr.patch deleted file mode 100644 index 547ee0bd3761..000000000000 --- a/nixpkgs/pkgs/development/libraries/nss/gcc-13-esr.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1771273 -https://hg.mozilla.org/projects/nss/raw-rev/21e7aaa1f7d94bca15d997e5b4c2329b32fad21a - -# HG changeset patch -# User Sergei Trofimovich <slyich@gmail.com> -# Date 1653552519 0 -# Node ID 21e7aaa1f7d94bca15d997e5b4c2329b32fad21a -# Parent ad1046e9eee5f5dc17dac7c9343e2f7f0da44b4e -Bug 1771273 - cpputil/databuffer.h: add missing <cstdint> include r=nss-reviewers,mt - -Without the change build fails on this week's gcc-13 snapshot as: - - ../../cpputil/databuffer.h:20:20: error: 'uint8_t' does not name a type - 20 | DataBuffer(const uint8_t* d, size_t l) : data_(nullptr), len_(0) { - | ^~~~~~~ - ../../cpputil/databuffer.h:14:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? - 13 | #include <iostream> - +++ |+#include <cstdint> - 14 | - -Differential Revision: https://phabricator.services.mozilla.com/D147404 - -diff --git a/cpputil/databuffer.h b/cpputil/databuffer.h ---- nss/cpputil/databuffer.h -+++ nss/cpputil/databuffer.h -@@ -6,16 +6,17 @@ - - #ifndef databuffer_h__ - #define databuffer_h__ - - #include <algorithm> - #include <cstring> - #include <iomanip> - #include <iostream> -+#include <cstdint> - - namespace nss_test { - - class DataBuffer { - public: - DataBuffer() : data_(nullptr), len_(0) {} - DataBuffer(const uint8_t* d, size_t l) : data_(nullptr), len_(0) { - Assign(d, l); - diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index b2d1c1e15fd8..b4330796e52c 100644 --- a/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -16,6 +16,7 @@ # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false , nixosTests +, nss_latest }: let @@ -41,17 +42,12 @@ stdenv.mkDerivation rec { patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - (if (lib.versionOlder version "3.84") then - ./85_security_load_3.77+.patch - else - ./85_security_load_3.85+.patch - ) + ./85_security_load_3.85+.patch ./fix-cross-compilation.patch - ] ++ lib.optionals (lib.versionOlder version "3.89") [ - # Backport gcc-13 build fix: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1771273 - # https://hg.mozilla.org/projects/nss/raw-rev/21e7aaa1f7d94bca15d997e5b4c2329b32fad21a - ./gcc-13-esr.patch + ] ++ lib.optionals (lib.versionOlder version "3.91") [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 + # https://phabricator.services.mozilla.com/D180068 + ./remove-c25519-support.patch ]; patchFlags = [ "-p0" ]; @@ -185,10 +181,10 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") { - inherit (nixosTests) firefox-esr-91; - } // lib.optionalAttrs (lib.versionAtLeast version "3.69") { - inherit (nixosTests) firefox firefox-esr-102; + passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) { + inherit (nixosTests) firefox-esr-102; + } // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) { + inherit (nixosTests) firefox firefox-esr-115; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/nss/latest.nix b/nixpkgs/pkgs/development/libraries/nss/latest.nix index fc00cd84b727..dfe3b066c878 100644 --- a/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/nixpkgs/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.89.1"; - hash = "sha256-OtrtuecMPF9AYDv2CgHjNhkKbb4Bkp05XxawH+hKAVY="; + version = "3.92"; + hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; } diff --git a/nixpkgs/pkgs/development/libraries/nss/remove-c25519-support.patch b/nixpkgs/pkgs/development/libraries/nss/remove-c25519-support.patch new file mode 100644 index 000000000000..d5dba016278f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nss/remove-c25519-support.patch @@ -0,0 +1,69 @@ +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 74e8e65..aa9dd95 100644 +--- nss/lib/freebl/Makefile ++++ nss/lib/freebl/Makefile +@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc) + HAVE_INT128_SUPPORT = 1 + DEFINES += -DHAVE_INT128_SUPPORT + else ifeq (1,$(CC_IS_GCC)) +- SUPPORTS_VALE_CURVE25519 = 1 + ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) + HAVE_INT128_SUPPORT = 1 + DEFINES += -DHAVE_INT128_SUPPORT +@@ -593,11 +592,6 @@ ifndef HAVE_INT128_SUPPORT + DEFINES += -DKRML_VERIFIED_UINT128 + endif + +-ifdef SUPPORTS_VALE_CURVE25519 +- VERIFIED_SRCS += Hacl_Curve25519_64.c +- DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM +-endif +- + ifndef NSS_DISABLE_CHACHAPOLY + ifeq ($(CPU_ARCH),x86_64) + ifndef NSS_DISABLE_AVX2 +diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp +index 65f9a80..23940ef 100644 +--- nss/lib/freebl/freebl.gyp ++++ nss/lib/freebl/freebl.gyp +@@ -866,12 +866,6 @@ + }], + ], + }], +- [ 'supports_vale_curve25519==1', { +- 'defines': [ +- # The Makefile does version-tests on GCC, but we're not doing that here. +- 'HACL_CAN_COMPILE_INLINE_ASM', +- ], +- }], + [ 'OS=="linux" or OS=="android"', { + 'conditions': [ + [ 'target_arch=="x64"', { +@@ -934,11 +928,6 @@ + 'variables': { + 'module': 'nss', + 'conditions': [ +- [ 'target_arch=="x64" and cc_is_gcc==1', { +- 'supports_vale_curve25519%': 1, +- }, { +- 'supports_vale_curve25519%': 0, +- }], + [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { + 'have_int128_support%': 1, + }, { +diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi +index d198c44..34b6b3c 100644 +--- nss/lib/freebl/freebl_base.gypi ++++ nss/lib/freebl/freebl_base.gypi +@@ -151,11 +151,6 @@ + 'ecl/curve25519_32.c', + ], + }], +- ['supports_vale_curve25519==1', { +- 'sources': [ +- 'verified/Hacl_Curve25519_64.c', +- ], +- }], + ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', { + 'sources': [ + # Gyp does not support per-file cflags, so working around like this. diff --git a/nixpkgs/pkgs/development/libraries/nsync/default.nix b/nixpkgs/pkgs/development/libraries/nsync/default.nix index 5a6024189471..a984058e9b10 100644 --- a/nixpkgs/pkgs/development/libraries/nsync/default.nix +++ b/nixpkgs/pkgs/development/libraries/nsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-bdnYrMnBnpnEKGuMlDLILfzgwfu/e5tyMdSDWqreyto="; + hash = "sha256-pE9waDI+6LQwbyPJ4zROoF93Vt6+SETxxJ/UxeZE5WE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/numcpp/default.nix b/nixpkgs/pkgs/development/libraries/numcpp/default.nix new file mode 100644 index 000000000000..56713f2a6a5e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/numcpp/default.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + python3, + gtest, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "numcpp"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "dpilger26"; + repo = "NumCpp"; + rev = "Version_${finalAttrs.version}"; + hash = "sha256-IAku1bcaMkawZxpQbvxcS6VX07ogw4UGo1DX2Wa8xwU="; + }; + + nativeCheckInputs = [gtest python3]; + + nativeBuildInputs = [cmake]; + + buildInputs = [boost]; + + cmakeFlags = lib.optionals finalAttrs.finalPackage.doCheck [ + "-DBUILD_TESTS=ON" + "-DBUILD_MULTIPLE_TEST=ON" + ]; + + doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isStatic; + + postInstall = '' + substituteInPlace $out/share/NumCpp/cmake/NumCppConfig.cmake \ + --replace "\''${PACKAGE_PREFIX_DIR}/" "" + ''; + + NIX_CFLAGS_COMPILE="-Wno-error"; + + meta = with lib; { + description = "A Templatized Header Only C++ Implementation of the Python NumPy Library"; + homepage = "https://github.com/dpilger26/NumCpp"; + license = licenses.mit; + maintainers = with maintainers; [spalf]; + platforms = platforms.unix; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix new file mode 100644 index 000000000000..1ad0076eeb20 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, fetchgit +}: + +stdenv.mkDerivation rec { + pname = "nv-codec-headers"; + version = "12.0.16.0"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "sha256-8YZU9pb0kzat0JBVEotaZUkNicQvLNIrIyPU9KTTjwg="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = licenses.mit; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix index 679b2c61c45a..f68b57f193b7 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix @@ -8,7 +8,7 @@ , symlinkJoin , tbb , hostSystem ? "CPP" -, deviceSystem ? if config.cudaSupport or false then "CUDA" else "OMP" +, deviceSystem ? if config.cudaSupport then "CUDA" else "OMP" }: # Policy for device_vector<T> diff --git a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 5e559af9357b..4a1976be2915 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mQtprgm6QonYiMUPPIcCbWxPQ/b2XuQiOkROZNPYaQk="; + sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0="; }; nativeBuildInputs = [ @@ -39,14 +39,6 @@ stdenv.mkDerivation rec { libva ]; - # Note: Attempt to remove on next release after 0.0.9 - # nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437 - # upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188 - NIX_CFLAGS_COMPILE = [ - "-Wno-error=format=" - "-Wno-error=int-conversion" - ]; - postFixup = '' addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" ''; diff --git a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix index ea8e1841b0c1..dfacf433b77f 100644 --- a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix +++ b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ocl-icd"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "OCL-dev"; repo = "ocl-icd"; rev = "v${version}"; - sha256 = "1km2rqc9pw6xxkqp77a22pxfsb5kgw95w9zd15l5jgvyjb6rqqad"; + sha256 = "sha256-nx9Zz5DpS29g1HRIwPAQi6i+d7Blxd53WQ7Sb1a3FHg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/octomap/default.nix b/nixpkgs/pkgs/development/libraries/octomap/default.nix index 40e81e195aa1..6b1816d8addc 100644 --- a/nixpkgs/pkgs/development/libraries/octomap/default.nix +++ b/nixpkgs/pkgs/development/libraries/octomap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; - sourceRoot = "source/octomap"; + sourceRoot = "${src.name}/octomap"; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix index f82a67b76e1c..d35976932663 100644 --- a/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.16.3"; + version = "0.16.4"; src = fetchurl { url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-x0Hb9Jv8Rozilkgk5bw/kG6pVrGuNZTFDTUcOD8DxBM="; + sha256 = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix deleted file mode 100644 index 73f15b744bf5..000000000000 --- a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, cmake -, pkg-config -, boost -, freeimage -, freetype -, libpng -, ois -, zziplib -, freeglut -, libGL -, libGLU -, libICE -, libSM -, libX11 -, libXaw -, libXmu -, libXrandr -, libXrender -, libXt -, libXxf86vm -, xorgproto -, darwin -, withNvidiaCg ? false -, nvidia_cg_toolkit -, withSamples ? false -}: - -let - inherit (darwin.apple_sdk.frameworks) AGL Cocoa; -in -stdenv.mkDerivation rec { - pname = "ogre"; - version = "1.10.11"; - - src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; - }; - - patches = [ - # aarch64-darwin support - (fetchpatch { - url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch"; - includes = [ "OgreMain/include/OgrePlatform*.h" ]; - sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y="; - }) - (fetchpatch { - url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch"; - sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ="; - }) - # aarch64-linux support - (fetchpatch { - name = "fix-build-on-aarch64-linux.patch"; - url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch"; - sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost - freeimage - freetype - libpng - ois - zziplib - ] ++ lib.optionals stdenv.isLinux [ - freeglut - libGL - libGLU - libICE - libSM - libX11 - libXaw - libXmu - libXrandr - libXrender - libXt - libXxf86vm - xorgproto - ] ++ lib.optionals stdenv.isDarwin [ - AGL - Cocoa - ] ++ lib.optionals withNvidiaCg [ - nvidia_cg_toolkit - ]; - - cmakeFlags = [ - "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" - "-DOGRE_BUILD_SAMPLES=${toString withSamples}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" - ]; - - meta = { - description = "3D Object-Oriented Graphics Rendering Engine"; - homepage = "https://www.ogre3d.org/"; - maintainers = with lib.maintainers; [ raskin wegank ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index ce4951937165..6bac6c5a425b 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -27,72 +27,85 @@ , libXxf86vm , xorgproto # darwin -, Cocoa +, darwin # optional , withNvidiaCg ? false , nvidia_cg_toolkit , withSamples ? false }: -stdenv.mkDerivation rec { - pname = "ogre"; - version = "13.6.4"; +let + common = { version, hash }: stdenv.mkDerivation { + pname = "ogre"; + inherit version; - src = fetchFromGitHub { - owner = "OGRECave"; - repo = "ogre"; - rev = "v${version}"; - hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8="; - }; + src = fetchFromGitHub { + owner = "OGRECave"; + repo = "ogre"; + rev = "v${version}"; + inherit hash; + }; + + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; - nativeBuildInputs = [ - cmake - pkg-config - unzip - ]; + buildInputs = [ + SDL2 + boost + freeimage + freetype + libpng + ois + pugixml + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; - buildInputs = [ - SDL2 - boost - freeimage - freetype - libpng - ois - pugixml - zziplib - ] ++ lib.optionals stdenv.isLinux [ - freeglut - libGL - libGLU - libICE - libSM - libX11 - libXaw - libXmu - libXrandr - libXrender - libXt - libXxf86vm - xorgproto - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ] ++ lib.optionals withNvidiaCg [ - nvidia_cg_toolkit - ]; + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; - cmakeFlags = [ - "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" - "-DOGRE_BUILD_DEPENDENCIES=OFF" - "-DOGRE_BUILD_SAMPLES=${toString withSamples}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" - ]; + meta = { + description = "3D Object-Oriented Graphics Rendering Engine"; + homepage = "https://www.ogre3d.org/"; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + }; + }; +in +{ + ogre_14 = common { + version = "14.0.1"; + hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU="; + }; - meta = { - description = "3D Object-Oriented Graphics Rendering Engine"; - homepage = "https://www.ogre3d.org/"; - maintainers = with lib.maintainers; [ raskin wegank ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; + ogre_13 = common { + version = "13.6.5"; + hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE="; }; } diff --git a/nixpkgs/pkgs/development/libraries/omorfi/default.nix b/nixpkgs/pkgs/development/libraries/omorfi/default.nix new file mode 100644 index 000000000000..d6d0f1741d17 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/omorfi/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, autoreconfHook +, cg3 +, fetchFromGitHub +, hfst +, hfst-ospell +, icu +, libvoikko +, makeWrapper +, pkg-config +, python3 +, zip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "omorfi"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "flammie"; + repo = "omorfi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; + }; + + # Fix for omorfi-hyphenate.sh file not found error + postInstall = '' + ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} + ''; + + nativeBuildInputs = [ + autoreconfHook + cg3 + makeWrapper + pkg-config + python3 + zip + python3.pkgs.wrapPython + ]; + + buildInputs = [ + python3.pkgs.hfst + hfst-ospell + libvoikko + ]; + + # Supplied pkg-config file doesn't properly expose these + propagatedBuildInputs = [ + hfst + icu + ]; + + # Wrap shell scripts so they find the Python scripts + # omorfi.bash inexplicably fails when wrapped + preFixup = '' + wrapPythonProgramsIn "$out/bin" "$out ${python3.pkgs.hfst}" + for i in "$out/bin"/*.{sh,bash}; do + if [ $(basename "$i") != "omorfi.bash" ]; then + wrapProgram "$i" --prefix "PATH" : "$out/bin/" + fi + done + ''; + + # Enable all features + configureFlags = [ + "--enable-labeled-segments" + "--enable-lemmatiser" + "--enable-segmenter" + "--enable-hyphenator" + ]; + + meta = with lib; { + description = "Analysis for Finnish text"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Darwin build fails due to hfst not being found + broken = stdenv.isDarwin; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix new file mode 100644 index 000000000000..fd47a05a1bc9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +# 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 { + pname = "oneDNN"; + version = "2.7.1"; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneDNN"; + rev = "v${version}"; + sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + }; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ]; + + # Tests fail on some Hydra builders, because they do not support SSE4.2. + doCheck = false; + + # Fixup bad cmake paths + postInstall = '' + substituteInPlace $out/lib/cmake/dnnl/dnnl-config.cmake \ + --replace "\''${PACKAGE_PREFIX_DIR}/" "" + + substituteInPlace $out/lib/cmake/dnnl/dnnl-targets.cmake \ + --replace "\''${_IMPORT_PREFIX}/" "" + ''; + + meta = with lib; { + 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 ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index fd47a05a1bc9..7eb656978e5f 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.7.1"; + version = "3.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + sha256 = "sha256-V+0NyQMa4pY9Rhw6bLuqTom0ps/+wm4mGfn1rTi+0YM="; }; outputs = [ "out" "dev" "doc" ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ alexarice bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index f01899290035..99e45c1013d1 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -1,59 +1,98 @@ { stdenv , lib , fetchFromGitHub +, fetchFromGitLab , fetchpatch , fetchurl -, pkg-config +, Foundation +, abseil-cpp , cmake -, python3Packages , libpng -, zlib -, eigen -, protobuf -, howard-hinnant-date , nlohmann_json -, boost -, oneDNN -, abseil-cpp_202111 -, gtest -, pythonSupport ? false , nsync -, flatbuffers +, pkg-config +, python3Packages +, re2 +, zlib +, microsoft-gsl +, iconv +, gtest +, protobuf3_21 +, pythonSupport ? true }: -# Python Support -# -# When enabling Python support a wheel is made and stored in a `dist` output. -# This wheel is then installed in a separate derivation. -assert pythonSupport -> lib.versionOlder protobuf.version "3.20"; +let + howard-hinnant-date = fetchFromGitHub { + owner = "HowardHinnant"; + repo = "date"; + rev = "v2.4.1"; + sha256 = "sha256-BYL7wxsYRI45l8C3VwxYIIocn5TzJnBtU0UZ9pHwwZw="; + }; + + eigen = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = "d10b27fe37736d2944630ecd7557cefa95cf87c9"; + sha256 = "sha256-Lmco0s9gIm9sIw7lCr5Iewye3RmrHEE4HLfyzRkQCm0="; + }; + + mp11 = fetchFromGitHub { + owner = "boostorg"; + repo = "mp11"; + rev = "boost-1.79.0"; + sha256 = "sha256-ZxgPDLvpISrjpEHKpLGBowRKGfSwTf6TBfJD18yw+LM="; + }; + + safeint = fetchFromGitHub { + owner = "dcleblanc"; + repo = "safeint"; + rev = "ff15c6ada150a5018c5ef2172401cb4529eac9c0"; + sha256 = "sha256-PK1ce4C0uCR4TzLFg+elZdSk5DdPCRhhwT3LvEwWnPU="; + }; + + pytorch_cpuinfo = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + # There are no tags in the repository + rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; + sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; + }; + flatbuffers = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "v1.12.0"; + sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg="; + }; + + gtest' = gtest.overrideAttrs (oldAttrs: rec { + version = "1.13.0"; + src = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "v${version}"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; + }; + }); +in stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.13.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "sha256-paaeq6QeiOzwiibbz0GkYZxEI/V80lvYNYTm6AuyAXQ="; + sha256 = "sha256-SnHo2sVACc++fog7Tg6f2LK/Sv/EskFzN7RZS7D113s="; fetchSubmodules = true; }; - patches = [ - # Use dnnl from nixpkgs instead of submodules - (fetchpatch { - name = "system-dnnl.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=9c392fb542979981fe0026e0fe3cc361a5f00a36"; - sha256 = "sha256-+kedzJHLFU1vMbKO9cn8fr+9A5+IxIuiqzOfR2AfJ0k="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config python3Packages.python - gtest + protobuf3_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -64,18 +103,26 @@ stdenv.mkDerivation rec { buildInputs = [ libpng zlib - howard-hinnant-date nlohmann_json - boost - oneDNN - protobuf - ] ++ lib.optionals pythonSupport [ nsync + re2 + microsoft-gsl + ] ++ lib.optionals pythonSupport [ python3Packages.numpy python3Packages.pybind11 python3Packages.packaging + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + iconv ]; + nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ + gtest' + pytest + sympy + onnx + ]); + # TODO: build server, and move .so's to lib output # Python's wheel is stored in a separate dist output outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "dist" ]; @@ -85,15 +132,23 @@ stdenv.mkDerivation rec { cmakeDir = "../cmake"; cmakeFlags = [ - "-Donnxruntime_PREFER_SYSTEM_LIB=ON" + "-DCMAKE_BUILD_TYPE=RELEASE" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + "-DFETCHCONTENT_QUIET=OFF" + "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" + "-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}" + "-DFETCHCONTENT_SOURCE_DIR_EIGEN=${eigen}" + "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers}" + "-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}" + "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" + "-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}" + "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}" + "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_ENABLE_LTO=ON" "-Donnxruntime_BUILD_UNIT_TESTS=ON" - "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" - "-Donnxruntime_USE_MPI=ON" - "-Deigen_SOURCE_PATH=${eigen.src}" - "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp_202111.src}" - "-Donnxruntime_USE_DNNL=YES" + "-Donnxruntime_ENABLE_LTO=ON" + "-Donnxruntime_USE_FULL_PROTOBUF=OFF" ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" ]; @@ -103,6 +158,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ + '' + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 + rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc ''; postBuild = lib.optionalString pythonSupport '' @@ -118,7 +176,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit protobuf; + protobuf = protobuf3_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; @@ -140,6 +198,6 @@ stdenv.mkDerivation rec { # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ jonringer puffnfresh ck3d ]; + maintainers = with maintainers; [ jonringer puffnfresh ck3d cbourjau ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/opae/default.nix b/nixpkgs/pkgs/development/libraries/opae/default.nix index 975e005530e7..339edf234f53 100644 --- a/nixpkgs/pkgs/development/libraries/opae/default.nix +++ b/nixpkgs/pkgs/development/libraries/opae/default.nix @@ -45,5 +45,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; + # Needs a major update, not compatible with gcc-11. + broken = true; }; } diff --git a/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix index 58307198f727..3732103d73a6 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix @@ -100,7 +100,7 @@ let description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; platforms = platforms.all; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 3d8a5588043f..40a64077acc9 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; }) + (fetchpatch { + name = "minizip-ng-4.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch"; + hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew="; + }) ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -78,6 +83,7 @@ stdenv.mkDerivation rec { "-DOCIO_INSTALL_EXT_PACKAGES=NONE" # GPU test fails with: freeglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" + "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 40614f489b51..0188e5e1ae96 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && +, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 , cudaPackages ? { } , enableUnfree ? false diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 3f120e2558f3..c82f0a0065b6 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -37,7 +37,7 @@ , blas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda diff --git a/nixpkgs/pkgs/development/libraries/opencv/tests.nix b/nixpkgs/pkgs/development/libraries/opencv/tests.nix index 03a89db0882f..d1966b1a4aa8 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/tests.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/tests.nix @@ -39,7 +39,7 @@ let "stitching" "video" ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; - testRunner = if stdenv.isDarwin then "" else "${lib.getExe xvfb-run} -a "; + testRunner = lib.optionalString (!stdenv.isDarwin) "${lib.getExe xvfb-run} -a "; testsPreparation = '' touch $out # several tests want a write access, so we have to copy files diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix index c016b7635aa1..64cf84e36c3f 100644 --- a/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.4.12"; + version = "2.5.5"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo="; + sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/openexr/default.nix b/nixpkgs/pkgs/development/libraries/openexr/default.nix index ba0263bcad13..1a135fa6d4a8 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -28,13 +28,39 @@ stdenv.mkDerivation rec { extraPrefix = "OpenEXR/IlmImf/"; sha256 = "1wa2jn6sa0n3phaqvklnlbgk1bz60y756ad4jk4d757pzpnannsy"; }) + (fetchpatch { + name = "CVE-2021-3933.patch"; + url = "https://github.com/AcademySoftwareFoundation/openexr/commit/5db6f7aee79e3e75e8c3780b18b28699614dd08e.patch"; + stripLen = 4; + extraPrefix = "OpenEXR/IlmImf/"; + sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ="; + }) + + # Backport gcc-13 fix: + # https://github.com/AcademySoftwareFoundation/openexr/pull/1264 + ./gcc-13.patch ]; - cmakeFlags = lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON"; + postPatch = '' + # tests are determined to use /var/tmp on unix + find . -name tmpDir.h | while read -r f ; do + substituteInPlace $f --replace '/var/tmp' "$TMPDIR" + done + # On slower machines this test can take more than the default 1500 seconds + echo 'set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)' >> OpenEXR/IlmImfTest/CMakeLists.txt + ''; + + cmakeFlags = [ + "-DCMAKE_CTEST_ARGUMENTS=--timeout;3600" + ] ++ lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON"; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ ilmbase zlib ]; + # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 + # https://github.com/AcademySoftwareFoundation/openexr/issues/1281 + doCheck = !stdenv.isAarch32 && !stdenv.isi686; + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com/"; diff --git a/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch b/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch new file mode 100644 index 000000000000..d508b6028f76 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openexr/gcc-13.patch @@ -0,0 +1,33 @@ +https://github.com/AcademySoftwareFoundation/openexr/pull/1264 +https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch + +--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp ++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp +@@ -159,6 +159,7 @@ + #include <limits> + + #include <cstddef> ++#include <cstdint> + + + // Windows specific addition to prevent the indirect import of the redefined min/max macros +--- a/OpenEXR/IlmImf/ImfHuf.cpp ++++ b/OpenEXR/IlmImf/ImfHuf.cpp +@@ -53,6 +53,7 @@ + #include <cstring> + #include <cassert> + #include <algorithm> ++#include <cstdint> + + + using namespace std; +--- a/OpenEXR/IlmImf/ImfMisc.cpp ++++ b/OpenEXR/IlmImf/ImfMisc.cpp +@@ -52,6 +52,7 @@ + #include <ImfConvert.h> + #include <ImfPartType.h> + #include <ImfTileDescription.h> ++#include <cstdint> + #include "ImfNamespace.h" + + OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER diff --git a/nixpkgs/pkgs/development/libraries/openimageio/1.x.nix b/nixpkgs/pkgs/development/libraries/openimageio/1.x.nix deleted file mode 100644 index 90d8df5f5a5a..000000000000 --- a/nixpkgs/pkgs/development/libraries/openimageio/1.x.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff -, opencolorio_1, openexr, unzip -}: - -stdenv.mkDerivation rec { - pname = "openimageio"; - version = "1.8.17"; - - src = fetchFromGitHub { - owner = "OpenImageIO"; - repo = "oiio"; - rev = "Release-${version}"; - sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2"; - }; - - outputs = [ "bin" "out" "dev" "doc" ]; - - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ - boost ilmbase libjpeg libpng - libtiff opencolorio_1 openexr - ]; - - cmakeFlags = [ - "-DUSE_PYTHON=OFF" - ]; - - makeFlags = [ - "ILMBASE_HOME=${ilmbase.dev}" - "OPENEXR_HOME=${openexr.dev}" - "USE_PYTHON=0" - "INSTALLDIR=${placeholder "out"}" - "dist_dir=" - ]; - - patches = [ - # Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17 - ./2539_backport.patch - ]; - - meta = with lib; { - homepage = "http://www.openimageio.org"; - description = "A library and tools for reading and writing images"; - license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.unix; - knownVulnerabilities = [ - # all discovered in 2.x but there is no reason to - # believe that these or similar vulnerabilties aren't - # present in the totally unmaintained 1.x branch - "CVE-2022-36354" - "CVE-2022-38143" - "CVE-2022-41639" - "CVE-2022-41649" - "CVE-2022-41684" - "CVE-2022-41794" - "CVE-2022-41837" - "CVE-2022-41838" - "CVE-2022-41977" - "CVE-2022-41981" - "CVE-2022-41988" - "CVE-2022-41999" - "CVE-2022-43592" - "CVE-2022-43593" - "CVE-2022-43594" - "CVE-2022-43595" - "CVE-2022-43596" - "CVE-2022-43597" - "CVE-2022-43598" - "CVE-2022-43599" - "CVE-2022-43600" - "CVE-2022-43601" - "CVE-2022-43602" - "CVE-2022-43603" - "CVE-2023-22845" - "CVE-2023-24472" - "CVE-2023-24473" - ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/openimageio/2539_backport.patch b/nixpkgs/pkgs/development/libraries/openimageio/2539_backport.patch deleted file mode 100644 index c484b2ef9cf9..000000000000 --- a/nixpkgs/pkgs/development/libraries/openimageio/2539_backport.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp -index 10b75c21..0287d9c5 100644 ---- a/src/libOpenImageIO/exif.cpp -+++ b/src/libOpenImageIO/exif.cpp -@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = { - - - -+// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define -+// them ourselves. -+#ifndef GPSTAG_VERSIONID - enum GPSTag { - GPSTAG_VERSIONID = 0, - GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2, -@@ -237,6 +240,7 @@ enum GPSTag { - GPSTAG_DIFFERENTIAL = 30, - GPSTAG_HPOSITIONINGERROR = 31 - }; -+#endif - - static const EXIF_tag_info gps_tag_table[] = { - { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 }, -@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = { - { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 }, - { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 }, - { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 }, -- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, -+ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, - { -1, NULL } // signal end of table - }; - diff --git a/nixpkgs/pkgs/development/libraries/openimageio/default.nix b/nixpkgs/pkgs/development/libraries/openimageio/default.nix index cf717cc33f35..60ae83dbdd82 100644 --- a/nixpkgs/pkgs/development/libraries/openimageio/default.nix +++ b/nixpkgs/pkgs/development/libraries/openimageio/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.4.12.0"; + version = "2.4.13.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - hash = "sha256-0Jilfe4jNNnpsbodJBFIyxjWqOA99MwmzAriwJgvqVs="; + hash = "sha256-VVLJJB32oTujB384rmqm4MHxWplYov7CqoLqhdWjTi4="; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix index 0f659654e243..eded5f1b5b96 100644 --- a/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,9 @@ { lib , stdenv , fetchurl -, fetchpatch # dependencies , cyrus_sasl -, db , groff , libsodium , libtool @@ -19,11 +17,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-1RcE5QF4QwwGzz2KoXTaZrrfVZdHpH2SC7VLLUqkCZE="; + hash = "sha256-Lieo1PTCr4/oQLVzJxwgqhY+JJh/l2UhRkQpD1vrONk="; }; # TODO: separate "out" and "bin" @@ -46,7 +44,6 @@ stdenv.mkDerivation rec { (cyrus_sasl.override { inherit openssl; }) - db libsodium libtool openssl diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index e9a0fece56fc..937669fc5855 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx - +, config # Enable CUDA support -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport, cudatoolkit # Enable the Sun Grid Engine bindings , enableSGE ? false diff --git a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index 8fc4539c6687..42bcf436b9a2 100644 --- a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -39,8 +39,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; - buildInputs = [ + buildInputs = lib.optionals (!stdenv.isDarwin) [ libX11 libXinerama libXrandr libGLU libGL + ] ++ [ glib ilmbase libxml2 pcre zlib ] ++ lib.optional jpegSupport libjpeg ++ lib.optional exrSupport openexr @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk ] + ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch b/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch new file mode 100644 index 000000000000..d1622977b64d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch @@ -0,0 +1,54 @@ +From 6a83f0c958811f07e0d11dfc6b5a6a98edfd5bdc Mon Sep 17 00:00:00 2001 +From: Tomas Mraz <tomas@openssl.org> +Date: Tue, 4 Jul 2023 17:30:35 +0200 +Subject: [PATCH] Do not ignore empty associated data with AES-SIV mode + +The AES-SIV mode allows for multiple associated data items +authenticated separately with any of these being 0 length. + +The provided implementation ignores such empty associated data +which is incorrect in regards to the RFC 5297 and is also +a security issue because such empty associated data then become +unauthenticated if an application expects to authenticate them. + +Fixes CVE-2023-2975 + +Reviewed-by: Matt Caswell <matt@openssl.org> +Reviewed-by: Paul Dale <pauli@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/21384) + +(cherry picked from commit c426c281cfc23ab182f7d7d7a35229e7db1494d9) +--- + .../implementations/ciphers/cipher_aes_siv.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c +index 45010b90db2a..b396c8651a32 100644 +--- a/providers/implementations/ciphers/cipher_aes_siv.c ++++ b/providers/implementations/ciphers/cipher_aes_siv.c +@@ -120,14 +120,18 @@ static int siv_cipher(void *vctx, unsigned char *out, size_t *outl, + if (!ossl_prov_is_running()) + return 0; + +- if (inl == 0) { +- *outl = 0; +- return 1; +- } ++ /* Ignore just empty encryption/decryption call and not AAD. */ ++ if (out != NULL) { ++ if (inl == 0) { ++ if (outl != NULL) ++ *outl = 0; ++ return 1; ++ } + +- if (outsize < inl) { +- ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); +- return 0; ++ if (outsize < inl) { ++ ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); ++ return 0; ++ } + } + + if (ctx->hw->cipher(ctx, out, in, inl) <= 0) diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 0449651090fe..fae2c5f1cc2f 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -142,7 +142,19 @@ let # trying to build binaries statically. ++ lib.optional static "no-ct" ++ lib.optional withZlib "zlib" - ; + ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [ + # This is necessary in order to avoid openssl adding -march + # flags which ultimately conflict with those added by + # cc-wrapper. Openssl assumes that it can scan CFLAGS to + # detect any -march flags, using this perl code: + # + # && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}}) + # + # The following bogus CFLAGS environment variable triggers the + # the code above, inhibiting `./Configure` from adding the + # conflicting flags. + "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}" + ]; makeFlags = [ "MANDIR=$(man)/share/man" @@ -220,10 +232,12 @@ let in { - + # If you do upgrade here, please update in pkgs/top-level/release.nix + # the permitted insecure version to ensure it gets cached for our users + # and backport this to stable release (23.05). openssl_1_1 = common { - version = "1.1.1u"; - sha256 = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y="; + version = "1.1.1v"; + sha256 = "sha256-1ml+KHHncjhGBALpNi1H0YOCsV758karpse9eA04prA="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -249,6 +263,9 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + # https://www.openssl.org/news/secadv/20230714.txt + ./3.0/CVE-2023-2975.patch + (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 9511f4f56f7e..4cd398e6394a 100644 --- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudaSupport ? config.cudaSupport, cudatoolkit # For visibility mostly. The whole approach to cuda architectures and capabilities # will be reworked soon. , cudaArch ? "compute_37" diff --git a/nixpkgs/pkgs/development/libraries/openvino/default.nix b/nixpkgs/pkgs/development/libraries/openvino/default.nix index 68e3de522769..b3809f095364 100644 --- a/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , fetchurl , substituteAll @@ -25,41 +24,30 @@ }: let - # See FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake - myriad_firmware_version = "20221129_35"; - myriad_usb_firmware = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_${myriad_firmware_version}.zip"; - hash = "sha256-HKNWbSlMjSafOgrS9WmenbsmeaJKRVssw0NhIwPYZ70="; - }; - myriad_pcie_firmware = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_${myriad_firmware_version}.zip"; - hash = "sha256-VmfrAoKQ++ySIgAxWQul+Hd0p7Y4sTF44Nz4RHpO6Mo="; - }; - # See GNA_VERSION in cmake/dependencies.cmake - gna_version = "03.00.00.1910"; + gna_version = "03.05.00.1906"; gna = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; - hash = "sha256-iU3bwK40WfBFE7hTsMq8MokN1Oo3IooCK2oyEBvbt/g="; + hash = "sha256-SlvobZwCaw4Qr6wqV/x8mddisw49UGq7OjOA+8/icm4="; }; tbbbind_version = "2_5"; tbbbind = fetchurl { - url = "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v2.tgz"; - hash = "sha256-hl54lMWEAiM8rw0bKIBW4OarK/fJ0AydxgVhxIS8kPQ="; + url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v3.tgz"; + hash = "sha256-053rJiwGmBteLS48WT6fyb5izk/rkd1OZI6SdTZZprM="; }; in stdenv.mkDerivation rec { pname = "openvino"; - version = "2022.3.0"; + version = "2023.0.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-Ie58zTNatiYZZQJ8kJh/+HlSetQjhAtf2Us83z1jGv4="; + hash = "sha256-z88SgAZ0UX9X7BhBA7/NU/UhVLltb6ANKolruU8YiZQ="; }; outputs = [ @@ -90,14 +78,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - mkdir -p temp/vpu/firmware/{pcie,usb}-ma2x8x - pushd temp/vpu/firmware - bsdtar -xf ${myriad_pcie_firmware} -C pcie-ma2x8x - echo "${myriad_pcie_firmware.url}" > pcie-ma2x8x/ie_dependency.info - bsdtar -xf ${myriad_usb_firmware} -C usb-ma2x8x - echo "${myriad_usb_firmware.url}" > usb-ma2x8x/ie_dependency.info - popd - mkdir -p temp/gna_${gna_version} pushd temp/ bsdtar -xf ${gna} @@ -184,7 +164,8 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Cannot find macos sdk + broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory. + || stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 23bfac2fe51d..91e978ce04b3 100644 --- a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.27"; + version = "1.0.28"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-QvwSNuIph/ea3dAGQ0VhOiOmPmQtnqleCEebRpH2SgE="; + sha256 = "sha256-rQ+Zkmvi4bWVp86KDPs7SLZ040stKUsC7Ycb9kltElk="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix b/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix index c60d79fd492f..05a3cefaeceb 100644 --- a/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix +++ b/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - sourceRoot = "source/orocos_kdl"; + sourceRoot = "${src.name}/orocos_kdl"; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen ]; diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 1f2646a03638..7f545958e71b 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - hash = "sha256-1QIMEGBZsqLYU3v5ZswD5K9VcIGLBovJlC10lBHhH7c="; + hash = "sha256-paLiRYgYshuedgDgW2nEsv4/Loq6qFyQMjfBJwqtHzw="; }; outputs = [ "out" "bin" "dev"]; diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix index 69dba0004f59..472478e37100 100644 --- a/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/nixpkgs/pkgs/development/libraries/partio/default.nix @@ -1,20 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, unzip +, cmake +, freeglut +, libGLU +, libGL +, zlib +, swig +, doxygen +, xorg +, python3 +, darwin +}: stdenv.mkDerivation rec { pname = "partio"; - version = "1.14.6"; + version = "1.17.1"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; rev = "refs/tags/v${version}"; - hash = "sha256-S8U5I3dllFzDSocU1mJ8FYCCmBpsOR4n174oiX5hvAM="; + hash = "sha256-3t3y3r4R/ePw2QE747rqumbrYRm1wNkSKN3n8MPPIVg="; }; outputs = [ "dev" "out" "lib" ]; - nativeBuildInputs = [ unzip cmake doxygen ]; - buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu python3 ]; + nativeBuildInputs = [ + unzip + cmake + doxygen + ]; + + buildInputs = [ + zlib + swig + xorg.libXi + xorg.libXmu + python3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.GLUT + ] ++ lib.optionals (!stdenv.isDarwin) [ + freeglut + libGLU + libGL + ]; # TODO: # Sexpr support @@ -23,9 +55,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; - homepage = "https://www.disneyanimation.com/technology/partio.html"; + homepage = "https://github.com/wdas/partio"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.guibou ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/pdal/default.nix b/nixpkgs/pkgs/development/libraries/pdal/default.nix index 1c5715eb3237..666b230e7470 100644 --- a/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "pdal"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = version; - sha256 = "sha256-WP74YMKYJ0VqsPkOzSfuFhSKM/aY5ynVVmDTP6/DmgA="; + sha256 = "sha256-AhekpvWAdbDAYAr38VXPBDGE40xvP0BnEAI2ZKF3ctY="; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; - maintainers = with maintainers; [ nh2 ]; + maintainers = teams.geospatial.members; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix b/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix new file mode 100644 index 000000000000..a6d7ee3cdb16 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, zlib +, freetype +, libjpeg +, libtiff +, libpng +}: + +stdenv.mkDerivation rec { + pname = "pdfhummus"; + version = "4.5.10"; + + src = fetchFromGitHub { + owner = "galkahana"; + repo = "PDF-Writer"; + rev = "v${version}"; + hash = "sha256-dhbb/9+6ftjde+oh665ujA5CvY+Ume0pz/ghrohcaNE="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qtbase + ]; + + propagatedBuildInputs = [ + zlib + freetype + libjpeg + libtiff + libpng + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + "-DUSE_BUNDLED=OFF" + # Use bundled LibAesgm + "-DUSE_UNBUNDLED_FALLBACK_BUNDLED=ON" + ]; + + meta = with lib; { + description = "A Fast and Free C++ Library for Creating, Parsing an Manipulating PDF Files and Streams"; + homepage = "https://www.pdfhummus.com"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} + diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index e0614c737417..fc0afbe2184c 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -7,14 +7,6 @@ stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; version = "4.10.0"; - meta = with lib; { - homepage = "https://phonon.kde.org/"; - description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21; - }; - src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"; @@ -34,17 +26,16 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - env.NIX_CFLAGS_COMPILE = - let gstPluginPaths = - lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" - (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]); + env.NIX_CFLAGS_COMPILE = let + gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" + (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]); in toString [ # This flag should be picked up through pkg-config, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" @@ -70,4 +61,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + + meta = with lib; { + homepage = "https://phonon.kde.org/"; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; + }; } diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 5c3bc936e8c1..9dacb57e8ea2 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E="; + hash = "sha256-BWCMb/IT8G3Z3nI4E9a03M1R5mGsEwmPdL/J7q8ctao="; }; buildInputs = lib.optional withPython python; diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 3048a1a51ac8..0916eae24669 100644 --- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.309"; + version = "8.310"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-W9r9nyxKHEf9ik6C+58Nj8+6TeEAO44Uvk4DR0NtbDM="; + sha256 = "sha256-kMgRq+ej0v/b+bSuq1HPbgpai++04++oBvPVucMR4ic="; }; nativeBuildInputs = [ rsync ] diff --git a/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix b/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix index 8b5f33599cd2..12b4cb021c1f 100644 --- a/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-p69go8KXQR21szPb+R1xuonyFj+ZJDunNeoU7M3zIsE="; + sha256 = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU="; }; nativeBuildInputs = [ cmake ]; # SDK contains libraries and build-system to develop projects for RP2040 chip # We only need to compile pioasm binary - sourceRoot = "source/tools/pioasm"; + sourceRoot = "${src.name}/tools/pioasm"; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/nixpkgs/pkgs/development/libraries/pinocchio/default.nix index eddf1faceb50..ad3e3ba1299c 100644 --- a/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/nixpkgs/pkgs/development/libraries/pinocchio/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "pinocchio"; - version = "2.6.18"; + version = "2.6.19"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-HkNCZpdGi2hJc2+/8XwLrrJcibpyA7fQN1vNuZ9jyhw="; + hash = "sha256-P7jSAQ6LYcboJHqtpneT4W8Pu5G3fd3/a8Gju9im1e8="; }; # error: use of undeclared identifier '__sincos' diff --git a/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix b/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix new file mode 100644 index 000000000000..fd1c1ae34b4c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub + +# build +, cmake +, pkg-config + +# runtime +, espeak-ng +, onnxruntime +}: + +let + espeak-ng' = espeak-ng.overrideAttrs (oldAttrs: { + version = "1.52-dev"; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "espeak-ng"; + rev = "61504f6b76bf9ebbb39b07d21cff2a02b87c99ff"; + hash = "sha256-RBHL11L5uazAFsPFwul2QIyJREXk9Uz8HTZx9JqmyIQ="; + }; + + patches = [ + ./espeak-mbrola.patch + ]; + }); +in +stdenv.mkDerivation rec { + pname = "piper-phonemize"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "piper-phonemize"; + rev = "refs/tags/v${version}"; + hash = "sha256-cMer7CSLOXv3jc9huVA3Oy5cjXjOX9XuEXpIWau1BNQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + espeak-ng' + onnxruntime + ]; + + passthru = { + espeak-ng = espeak-ng'; + }; + + meta = with lib; { + description = "C++ library for converting text to phonemes for Piper"; + homepage = "https://github.com/rhasspy/piper-phonemize"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch b/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch new file mode 100644 index 000000000000..9d3f0aeb4abe --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch @@ -0,0 +1,26 @@ +diff --git a/src/libespeak-ng/mbrowrap.c b/src/libespeak-ng/mbrowrap.c +index ae137873..9015cc01 100644 +--- a/src/libespeak-ng/mbrowrap.c ++++ b/src/libespeak-ng/mbrowrap.c +@@ -206,7 +206,7 @@ static int start_mbrola(const char *voice_path) + signal(SIGTERM, SIG_IGN); + + snprintf(charbuf, sizeof(charbuf), "%g", mbr_volume); +- execlp("mbrola", "mbrola", "-e", "-v", charbuf, ++ execlp("@mbrola/bin/mbrola", "mbrola", "-e", "-v", charbuf, + voice_path, "-", "-.wav", (char *)NULL); + /* if execution reaches this point then the exec() failed */ + snprintf(mbr_errorbuf, sizeof(mbr_errorbuf), +diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c +index 734631b7..46d1f13e 100644 +--- a/src/libespeak-ng/synth_mbrola.c ++++ b/src/libespeak-ng/synth_mbrola.c +@@ -85,7 +85,7 @@ espeak_ng_STATUS LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, + if (!load_MBR()) + return ENS_MBROLA_NOT_FOUND; + +- sprintf(path, "%s/mbrola/%s", path_home, mbrola_voice); ++ sprintf(path, "@mbrola@/share/mbrola/voices/%s/%s", mbrola_voice, mbrola_voice); + #if PLATFORM_POSIX + // if not found, then also look in + // usr/share/mbrola/xx, /usr/share/mbrola/xx/xx, /usr/share/mbrola/voices/xx diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 2e60f72a40d5..3f58975cf3b4 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -66,6 +66,8 @@ , mysofaSupport ? true , libmysofa , tinycompress +, ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, ffado }: let @@ -73,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.71"; + version = "0.3.74"; outputs = [ "out" @@ -91,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-NPYWl+WeI/z70gNHX1BAKslGFX634D7XrV04vuJgGOo="; + sha256 = "sha256-ZV66niKeR4PDaqUuVqiosY7LSDLmIjrDsmCZyQkR72Y="; }; patches = [ @@ -149,7 +151,8 @@ let ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] - ++ lib.optional mysofaSupport libmysofa; + ++ lib.optional mysofaSupport libmysofa + ++ lib.optional ffadoSupport ffado; # Valgrind binary is required for running one optional test. nativeCheckInputs = lib.optional withValgrind valgrind; @@ -163,6 +166,7 @@ let "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" + "-Dlibffado=${mesonEnableFeature ffadoSupport}" "-Droc=${mesonEnableFeature rocSupport}" "-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}" "-Davahi=${mesonEnableFeature zeroconfSupport}" @@ -221,6 +225,7 @@ let meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; + changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${version}"; homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/plog/default.nix b/nixpkgs/pkgs/development/libraries/plog/default.nix new file mode 100644 index 000000000000..789502283b7f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/plog/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "plog"; + version = "1.1.9"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "SergiusTheBest"; + repo = pname; + rev = version; + hash = "sha256-CARTr1EEqXNJtp6XwHhr7aiRBiYR0cClzexpNCMaQJc="; + }; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DPLOG_BUILD_SAMPLES=NO" + ]; + + meta = with lib; { + description = "Portable, simple and extensible C++ logging library"; + homepage = "https://github.com/SergiusTheBest/plog"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ raphaelr erdnaxe ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix b/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix index 92231718c261..96fe45ddc2e1 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-Z9mVAo2dITEtTdqA2sftaLZSCiTbGS02RYxfNcEwd1c="; + hash = "sha256-Y5dpx0otX14Jig/O/oq+Sfdcia1a0bhT/6k8nwg+k5o="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index d99e5150678e..bc1478a90925 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -41,19 +41,19 @@ let domain = "gitlab.freedesktop.org"; owner = "poppler"; repo = "test"; - rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435"; - hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; + rev = "e3cdc82782941a8d7b8112f83b4a81b3d334601a"; + hash = "sha256-i/NjVWC/PXAXnv88qNaHFBQQNEjRgjdV224NgENaESo="; }; in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.07.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k="; + hash = "sha256-8ptLS/R1cmERdkVMjyFQbXHSfspQEaOapEA4swuVfbA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix index 2593c04fa158..2fa5a4d268cc 100644 --- a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am"; }; - sourceRoot = "source/scripts"; + sourceRoot = "${src.name}/scripts"; buildPhase = '' $CC nad2bin.c -o nad2bin diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index 5e063b59f3de..69aa94408b94 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: rec { description = "Cartographic Projections Library"; homepage = "https://proj.org/"; license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; }; }) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index cbe669ffd377..9dc7f70c2fe2 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -33,7 +33,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; buildInputs = [ zlib ]; - configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; + configureFlags = lib.optional (buildProtobuf != null) "--with-protoc=${buildProtobuf}/bin/protoc"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/qdjango/default.nix b/nixpkgs/pkgs/development/libraries/qdjango/default.nix new file mode 100644 index 000000000000..8036373a826a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qdjango/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, testers +, doxygen +, qmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qdjango"; + version = "unstable-2018-03-07"; + + src = fetchFromGitHub { + owner = "jlaine"; + repo = "qdjango"; + rev = "bda4755ece9d173a67b880e498027fcdc51598a8"; + hash = "sha256-5MfRfsIlv73VMvKMBCLviXFovyGH0On5ukLIEy7zwkk="; + }; + + outputs = [ "out" "dev" "doc" ]; + + postPatch = '' + # HTML docs depend on regular docs + substituteInPlace qdjango.pro \ + --replace 'dist.depends = docs' 'htmldocs.depends = docs' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # tst_Auth:constIterator (tests/db/auth/tst_auth.cpp:624) fails on Darwin? + # QVERIFY(&*(it += 2) == 0) evals to false + substituteInPlace tests/db/db.pro \ + --replace 'auth' "" + ''; + + qmakeFlags = [ + # Uses Qt testing infrastructure via QMake CONFIG testcase, + # defaults to installing all testcase targets under Qt prefix + # https://github.com/qt/qtbase/blob/29400a683f96867133b28299c0d0bd6bcf40df35/mkspecs/features/testcase.prf#L110-L120 + "CONFIG+=no_testcase_installs" + + # Qmake-generated pkg-config files default to Qt prefix + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + + nativeBuildInputs = [ + doxygen + qmake + ]; + + dontWrapQtApps = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path. + # for some reason, this doesn't work when just exporting the needed paths even though the autogenerated wrappers + # should at most prepend paths? just patch them into the wrappers instead + substituteInPlace $(find tests -name target_wrapper.sh) \ + --replace 'DYLD_LIBRARY_PATH=' "DYLD_LIBRARY_PATH=$PWD/src/db:$PWD/src/http:" + ''; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "Qt-based C++ web framework"; + homepage = "https://github.com/jlaine/qdjango"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + pkgConfigModules = [ + "qdjango-db" + "qdjango-http" + ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index bd6ebbd8e375..378b6babd727 100644 --- a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qtquick1 +, qmake +, qtmultimedia +, utmp +}: stdenv.mkDerivation { - version = "2018-11-24"; - pname = "qmltermwidget-unstable"; + pname = "qmltermwidget"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { repo = "qmltermwidget"; owner = "Swordfish90"; - rev = "48274c75660e28d44af7c195e79accdf1bd44963"; - sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6"; + rev = "63228027e1f97c24abb907550b22ee91836929c5"; + hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - buildInputs = [ qtbase qtquick1 qtmultimedia ] - ++ lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; + buildInputs = [ + qtbase + qtquick1 + qtmultimedia + ] ++ lib.optional stdenv.isDarwin utmp; + patches = [ - (fetchpatch { - name = "fix-missing-includes.patch"; - url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff"; - sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj"; - }) + # Some files are copied twice to the output which makes the build fails + ./do-not-copy-artifacts-twice.patch ]; postPatch = '' @@ -28,7 +37,7 @@ stdenv.mkDerivation { --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" ''; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch b/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch new file mode 100644 index 000000000000..a10c4b16055a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch @@ -0,0 +1,10 @@ +diff --git a/qmltermwidget.pro b/qmltermwidget.pro +index c9594a9..aa1a804 100644 +--- a/qmltermwidget.pro ++++ b/qmltermwidget.pro +@@ -62,4 +62,4 @@ kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic + scrollbar.files = $$PWD/src/QMLTermScrollbar.qml + scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH + +-INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar ++INSTALLS += target qmldir assets diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 67e16f6f3eeb..b1b78bb25704 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.3.0"; + version = "11.4.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-UZq973X93E+Ll1IKjfJNPQuQwBFOU3egFGODgXV21x0="; + hash = "sha256-cG8TxgWXZGol7X2eRQNeknMo4L8PoWSMvxOsDVO/Rx4="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix b/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix index 856f2f88e832..53ed6eeb80ec 100644 --- a/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix +++ b/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix @@ -3,39 +3,50 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qrcodegen"; version = "1.8.0"; src = fetchFromGitHub { owner = "nayuki"; repo = "QR-Code-generator"; - rev = "v${version}"; - sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; }; - preBuild = '' - cd c/ + sourceRoot = "${finalAttrs.src.name}/c"; + + nativeBuildInputs = lib.optionals stdenv.cc.isClang [ + stdenv.cc.cc.libllvm.out + ]; + + makeFlags = lib.optionals stdenv.cc.isClang [ "AR=llvm-ar" ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + + ./qrcodegen-test + + runHook postCheck ''; installPhase = '' runHook preInstall - mkdir -p $out/lib $out/include/qrcodegen - cp libqrcodegen.a $out/lib - cp qrcodegen.h $out/include/qrcodegen/ + install -Dt $out/lib/ libqrcodegen.a + install -Dt $out/include/qrcodegen/ qrcodegen.h runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.nayuki.io/page/qr-code-generator-library"; description = "High-quality QR Code generator library in many languages"; - license = licenses.mit; - maintainers = with maintainers; [ mcbeth AndersonTorres ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) # TODO: build the other languages # TODO: multiple outputs diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 68a300ac250d..a8257a36d39d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -173,9 +173,9 @@ stdenv.mkDerivation rec { "-make" "libs" "-make" "tools" "-make" "translations" "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend" ]) ++ [ - "-${if demos then "" else "no"}make" "demos" - "-${if examples then "" else "no"}make" "examples" - "-${if docs then "" else "no"}make" "docs" + "-${lib.optionalString (!demos) "no"}make" "demos" + "-${lib.optionalString (!examples) "no"}make" "examples" + "-${lib.optionalString (!docs) "no"}make" "docs" ] ++ lib.optional developerBuild "-developer-build" ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ] ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8b5d497c5e9a..de73bcbe2772 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation (finalAttrs: { propagatedNativeBuildInputs = [ lndir ]; + # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked + # against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`. + propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + (allow file-read* (subpath "/usr/share/icu")) + ''; + enableParallelBuilding = true; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index 0f164fb3ce02..d9bc6ae15e1f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -133,7 +133,7 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind; + inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback diff --git a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index 9152133443e3..519f2f887d1f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 004a18f53c78..3bbe39e5ee20 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -13,7 +13,7 @@ qtModule { --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc" done ''; - nativeBuildInputs = [ qttools ]; + nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; qtInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 1cf228d4e280..43c6dade7de3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,12 @@ qtModule rec { pname = "qtmqtt"; - version = "6.5.1"; + version = "6.5.2"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-tXCLb4ZWgdPSfnlGKsKNW9kJ57cm8+d8y416O42NZvk="; + hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0="; }; qtInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix index 7d13e9a03e5c..adca87550cca 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -3,13 +3,15 @@ , lib , qtbase , qtdeclarative -, llvmPackages , cups +, llvmPackages +# clang-based c++ parser for qdoc and lupdate +, withClang ? false }: qtModule { pname = "qttools"; - buildInputs = [ + buildInputs = lib.optionals withClang [ llvmPackages.libclang llvmPackages.llvm ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index fadbc5d2bfa3..909616d953de 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -66,7 +66,7 @@ , xkeyboard_config , enableProprietaryCodecs ? true # darwin -, clang_14 +, llvmPackages_14 , bootstrap_cmds , cctools , xcbuild @@ -113,7 +113,7 @@ qtModule { gn nodejs ] ++ lib.optionals stdenv.isDarwin [ - clang_14 + llvmPackages_14.clang bootstrap_cmds cctools xcbuild @@ -309,7 +309,6 @@ qtModule { meta = with lib; { description = "A web engine based on the Chromium web browser"; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix b/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix index 0202783a9d8e..f0bf8721074f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix @@ -8,8 +8,10 @@ buildEnv { extraOutputsToInstall = [ "out" "dev" ]; postBuild = '' - rm "$out/bin/qmake" - cp "${qtbase}/bin/qmake" "$out/bin" + for f in qmake qmake6; do + rm "$out/bin/$f" + cp "${qtbase}/bin/$f" "$out/bin" + done cat >"$out/bin/qt.conf" <<EOF [Paths] Prefix = $out diff --git a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 77b5284c9ca2..a0ac367f162c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -1,310 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt3d-everywhere-src-6.5.1.tar.xz"; - sha256 = "16v875hv58f1cnb76c8pd63v44fncfdrv29b008bamxs23lf2m3y"; - name = "qt3d-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz"; + sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11"; + name = "qt3d-everywhere-src-6.5.2.tar.xz"; + }; + }; + qt5 = { + version = "6.5.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz"; + sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515"; + name = "qt5-everywhere-src-6.5.2.tar.xz"; }; }; qt5compat = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt5compat-everywhere-src-6.5.1.tar.xz"; - sha256 = "10zvah04mnyg5apkwq015kxs03y467naicxy8ljfzazgbwljp6df"; - name = "qt5compat-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz"; + sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"; + name = "qt5compat-everywhere-src-6.5.2.tar.xz"; }; }; qtactiveqt = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz"; - sha256 = "0yii7ihvzncwqhrb1635my5arr6lymr2d3wnwpcn42b7l6krsk6d"; - name = "qtactiveqt-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz"; + sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x"; + name = "qtactiveqt-everywhere-src-6.5.2.tar.xz"; }; }; qtbase = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtbase-everywhere-src-6.5.1.tar.xz"; - sha256 = "1vdzxrcfhn6ym7p8jzr3xxx1r4r435fx461lwfgii8838cgzlmnv"; - name = "qtbase-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz"; + sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"; + name = "qtbase-everywhere-src-6.5.2.tar.xz"; }; }; qtcharts = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtcharts-everywhere-src-6.5.1.tar.xz"; - sha256 = "0xfgj970ip0fn2gxrsilg1gvq4w2849vs6gysn0qhnz7qw7m0nxi"; - name = "qtcharts-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz"; + sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp"; + name = "qtcharts-everywhere-src-6.5.2.tar.xz"; }; }; qtconnectivity = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtconnectivity-everywhere-src-6.5.1.tar.xz"; - sha256 = "0yl2i4qdmvdzspnr0jpf031gd2cndkx4hppy5sdjppy4g2dlrmrg"; - name = "qtconnectivity-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz"; + sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv"; + name = "qtconnectivity-everywhere-src-6.5.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdatavis3d-everywhere-src-6.5.1.tar.xz"; - sha256 = "0cx3bmbwg0y99495zp1gafs4bfn75dbf6r6dfgy1ii9i66y2lcsj"; - name = "qtdatavis3d-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz"; + sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8"; + name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz"; }; }; qtdeclarative = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz"; - sha256 = "0yff5nbcspl3w3231wvgvac38q0lskxx1l2wm1lx2raac7wlh490"; - name = "qtdeclarative-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz"; + sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"; + name = "qtdeclarative-everywhere-src-6.5.2.tar.xz"; }; }; qtdoc = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdoc-everywhere-src-6.5.1.tar.xz"; - sha256 = "0c9ckm7rcp3vi7qipzqyqpar2f5l426s8vgdz71q1ccx432a0kj1"; - name = "qtdoc-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz"; + sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3"; + name = "qtdoc-everywhere-src-6.5.2.tar.xz"; }; }; qtgrpc = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtgrpc-everywhere-src-6.5.1.tar.xz"; - sha256 = "1r27m7c1ab1gk2hzi4d9mpvk1kc5zypx6d6q9wa7kv26d4d2vgls"; - name = "qtgrpc-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz"; + sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks"; + name = "qtgrpc-everywhere-src-6.5.2.tar.xz"; }; }; qthttpserver = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qthttpserver-everywhere-src-6.5.1.tar.xz"; - sha256 = "0z7wrvfln7mr7n1i1pijx36c6wi66dm91mdir5f8gqk15i84zpj7"; - name = "qthttpserver-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz"; + sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq"; + name = "qthttpserver-everywhere-src-6.5.2.tar.xz"; }; }; qtimageformats = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtimageformats-everywhere-src-6.5.1.tar.xz"; - sha256 = "1daxijk9mb2gb65pxjdqw4r5vjs3vi20d4lixq6mh0xdk717yzw9"; - name = "qtimageformats-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz"; + sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"; + name = "qtimageformats-everywhere-src-6.5.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlanguageserver-everywhere-src-6.5.1.tar.xz"; - sha256 = "1j9bhd4k30ana08nppqqll6v5nxr9dzxqxsh12i2cihjr9mcr9lr"; - name = "qtlanguageserver-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz"; + sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"; + name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz"; }; }; qtlocation = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlocation-everywhere-src-6.5.1.tar.xz"; - sha256 = "1x0j6r0gll469aq75viyyyw1gfl180rcyq0h83z35664jzx1i2mn"; - name = "qtlocation-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz"; + sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9"; + name = "qtlocation-everywhere-src-6.5.2.tar.xz"; }; }; qtlottie = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlottie-everywhere-src-6.5.1.tar.xz"; - sha256 = "10bbq952iv3f2v42nqirld0qy363g03zdq6hlh1lfcbmgc8gif0h"; - name = "qtlottie-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz"; + sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"; + name = "qtlottie-everywhere-src-6.5.2.tar.xz"; }; }; qtmultimedia = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtmultimedia-everywhere-src-6.5.1.tar.xz"; - sha256 = "1k71chjdh66yv13li38ig507wpsr7cn87nqkvcfxmkf8w5hca7qb"; - name = "qtmultimedia-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz"; + sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"; + name = "qtmultimedia-everywhere-src-6.5.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtnetworkauth-everywhere-src-6.5.1.tar.xz"; - sha256 = "18viv41qazcbix9l21g5vz1r6zp6mxnbl2c2j3ip1yln7rmbac57"; - name = "qtnetworkauth-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz"; + sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"; + name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz"; }; }; qtpositioning = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtpositioning-everywhere-src-6.5.1.tar.xz"; - sha256 = "08m41rx1yd28dr53pfrdfvgkmnszqyax88jhqczcb048w50gjg05"; - name = "qtpositioning-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz"; + sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"; + name = "qtpositioning-everywhere-src-6.5.2.tar.xz"; }; }; qtquick3d = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3d-everywhere-src-6.5.1.tar.xz"; - sha256 = "07ncn3gl3yvdq8ly3rn7693lzq0slghmw9ljq119s4bbsnk2ddji"; - name = "qtquick3d-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz"; + sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m"; + name = "qtquick3d-everywhere-src-6.5.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3dphysics-everywhere-src-6.5.1.tar.xz"; - sha256 = "1j0kfqdwx8x7bagw8qjkywsd2fzih2yp36vza2hil56m35s8ibcl"; - name = "qtquick3dphysics-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; + sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m"; + name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquickeffectmaker-everywhere-src-6.5.1.tar.xz"; - sha256 = "18lhvf9mlprmg0jba9biciscns12zvwr5jj81kkvv0mv8h3yrg2i"; - name = "qtquickeffectmaker-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; + sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym"; + name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquicktimeline-everywhere-src-6.5.1.tar.xz"; - sha256 = "0lfm997p5x5nn4zlz2p1djd3757b0m00347xkfy9n6y5fsidny8h"; - name = "qtquicktimeline-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz"; + sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9"; + name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtremoteobjects-everywhere-src-6.5.1.tar.xz"; - sha256 = "16v2qzn5lf5bxrdff4fr624x5n262qvhinrk0vfmcdvrb2plgkvq"; - name = "qtremoteobjects-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz"; + sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"; + name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz"; }; }; qtscxml = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtscxml-everywhere-src-6.5.1.tar.xz"; - sha256 = "0xr4005b640r1h7nbfmgjban9mihxgm4sfqizw30xhsjpg4a6ghw"; - name = "qtscxml-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz"; + sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58"; + name = "qtscxml-everywhere-src-6.5.2.tar.xz"; }; }; qtsensors = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsensors-everywhere-src-6.5.1.tar.xz"; - sha256 = "19dbci4487anpkm85n1yly1mm5zx1f5dgx08v5ar5462f61wlnn9"; - name = "qtsensors-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz"; + sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0"; + name = "qtsensors-everywhere-src-6.5.2.tar.xz"; }; }; qtserialbus = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialbus-everywhere-src-6.5.1.tar.xz"; - sha256 = "0zqmbqnaf8ln6kdf5nc9k4q618d7jd4dmc2gsmgcf2mz55w9dzyv"; - name = "qtserialbus-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz"; + sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph"; + name = "qtserialbus-everywhere-src-6.5.2.tar.xz"; }; }; qtserialport = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialport-everywhere-src-6.5.1.tar.xz"; - sha256 = "19ijnjy5bqv7g74q2ax4pvmggphpccckszxilj0vkqnl8q34smf3"; - name = "qtserialport-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz"; + sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06"; + name = "qtserialport-everywhere-src-6.5.2.tar.xz"; }; }; qtshadertools = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtshadertools-everywhere-src-6.5.1.tar.xz"; - sha256 = "0ljhysyiwxawws0481hyk1xbycc21jg6gq5fsn8yyi2rhdhng075"; - name = "qtshadertools-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz"; + sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"; + name = "qtshadertools-everywhere-src-6.5.2.tar.xz"; }; }; qtspeech = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtspeech-everywhere-src-6.5.1.tar.xz"; - sha256 = "1djp6ijjvl94zajbvgz80xnzd2fpkq8fnnpxnq9jg5jny6jhn4k7"; - name = "qtspeech-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz"; + sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8"; + name = "qtspeech-everywhere-src-6.5.2.tar.xz"; }; }; qtsvg = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsvg-everywhere-src-6.5.1.tar.xz"; - sha256 = "1vq8jvz13hp9nj9r77f0nx7nq3pciy4sk1j6d2dzbw243m4jk3fm"; - name = "qtsvg-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz"; + sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"; + name = "qtsvg-everywhere-src-6.5.2.tar.xz"; }; }; qttools = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttools-everywhere-src-6.5.1.tar.xz"; - sha256 = "0a93xg65z19bldwhc77x87khjwkx3hs01z1gjdznza5jhjgdyi2p"; - name = "qttools-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz"; + sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"; + name = "qttools-everywhere-src-6.5.2.tar.xz"; }; }; qttranslations = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttranslations-everywhere-src-6.5.1.tar.xz"; - sha256 = "16ylh1hf7r4g8s0h6wgkngwy1p75qnq6byz1q14wwzk3q8s2qzjj"; - name = "qttranslations-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz"; + sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"; + name = "qttranslations-everywhere-src-6.5.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz"; - sha256 = "1h9whvpdy37vazl095qqvsl8d2b298v2i25fsvr04x9ns3b47cl9"; - name = "qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; + sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05"; + name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; }; }; qtwayland = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwayland-everywhere-src-6.5.1.tar.xz"; - sha256 = "0kcp1adgszcrwv89f2m3rp2ldbrbnb7prkr8065w5j9ik2hiw7vw"; - name = "qtwayland-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz"; + sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"; + name = "qtwayland-everywhere-src-6.5.2.tar.xz"; }; }; qtwebchannel = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebchannel-everywhere-src-6.5.1.tar.xz"; - sha256 = "0jpc231gmgy540x9im8ld1fjmxqjaw1c40r6d2g5gxrpwxkl6drb"; - name = "qtwebchannel-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz"; + sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"; + name = "qtwebchannel-everywhere-src-6.5.2.tar.xz"; }; }; qtwebengine = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebengine-everywhere-src-6.5.1.tar.xz"; - sha256 = "0clcxkybgn5ny22rbdckxczqsf5gc3f55q7r02l5q7q6biqbs61g"; - name = "qtwebengine-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz"; + sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"; + name = "qtwebengine-everywhere-src-6.5.2.tar.xz"; }; }; qtwebsockets = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebsockets-everywhere-src-6.5.1.tar.xz"; - sha256 = "06fsc42x571af78rlx8ah7i9nqc9qnzqvd1mmrx12xd6a2r6d3vb"; - name = "qtwebsockets-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz"; + sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"; + name = "qtwebsockets-everywhere-src-6.5.2.tar.xz"; }; }; qtwebview = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebview-everywhere-src-6.5.1.tar.xz"; - sha256 = "0r1six7k9nz1n64c8ff1j24x2dfrr931aiwygpsf36bim27bdbvb"; - name = "qtwebview-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz"; + sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr"; + name = "qtwebview-everywhere-src-6.5.2.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch b/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch deleted file mode 100644 index 30d93cd7bf8b..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/0002-Fix-install-name-Darwin.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -215,7 +215,6 @@ - VERSION ${QTKEYCHAIN_VERSION} - SOVERSION ${QTKEYCHAIN_SOVERSION} - MACOSX_RPATH 1 -- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" - INSTALL_RPATH_USE_LINK_PATH TRUE - ) - diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index e06667540719..1f9ffb373082 100644 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -12,18 +12,19 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; - rev = "v${version}"; - sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1 + rev = version; + sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw="; }; dontWrapQtApps = true; - patches = [ ./0002-Fix-install-name-Darwin.patch ]; + # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qtbase` + sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; cmakeFlags = [ "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}" diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 6198a0593458..b91449542958 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - sourceRoot = "source/Kvantum"; + sourceRoot = "${src.name}/Kvantum"; buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index af4f194efc80..0d9d1d42c0fb 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; - sourceRoot = "source/Kvantum"; + sourceRoot = "${src.name}/Kvantum"; patches = [ (fetchpatch { diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index d63227ef9fc1..93ecaa698f7a 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,18 +9,20 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.12.2"; + version = "6.13.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-YYuTDUBTNKLmieb/pDljiN0T8NdaOb2aRmwkD85ZF38="; + hash = "sha256-gfGVVjtzpBGrPrp2k3fOIh54EAMSicyikF1CtaO74y8="; }; buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + dontWrapQtApps = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/quictls/default.nix b/nixpkgs/pkgs/development/libraries/quictls/default.nix index 052417f31174..5f56c451f8be 100644 --- a/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.8+quic"; + version = "3.0.9-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${version}"; - sha256 = "sha256-6t23EY+Gk/MvLOcYpDbL5jEr0rMaaPYOsc+12WFgv1c="; + sha256 = "sha256-AXhZD8gDnOSZajQL+fFOcGXH+yCnns9fCWvfk6/OFqA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/rarian/default.nix b/nixpkgs/pkgs/development/libraries/rarian/default.nix deleted file mode 100644 index b8995e6a2c48..000000000000 --- a/nixpkgs/pkgs/development/libraries/rarian/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome}: -let - pname = "rarian"; - version = "0.8.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.gz"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 libxslt ] - ++ (with perlPackages; [ perl XMLParser ]); - configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; - - meta = with lib; { - description = "Documentation metadata library based on the proposed Freedesktop.org spec"; - homepage = "https://rarian.freedesktop.org/"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/raylib/default.nix b/nixpkgs/pkgs/development/libraries/raylib/default.nix index c2655a6a380f..5af34139f930 100644 --- a/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -8,15 +8,15 @@ , raylib-games }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "raylib"; - version = "4.2.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "raysan5"; - repo = pname; - rev = version; - sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM="; + repo = "raylib"; + rev = finalAttrs.version; + hash = "sha256-Uqqzq5shDp0AgSBT5waHBNUkEu0LRj70SNOlR5R2yAM="; }; nativeBuildInputs = [ cmake ]; @@ -27,16 +27,6 @@ stdenv.mkDerivation rec { ++ lib.optional pulseSupport libpulseaudio; propagatedBuildInputs = [ libGLU libX11 ]; - patches = [ - # fixes glfw compile error; - # remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released. - (fetchpatch { - url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch"; - sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY="; - name = "raylib-glfw-fix.patch"; - }) - ]; - # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ "-DUSE_EXTERNAL_GLFW=ON" @@ -45,20 +35,29 @@ stdenv.mkDerivation rec { ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + passthru.tests = [ raylib-games ]; + + patches = [ + # Patch version in CMakeList to 4.5.0 + # Remove this when updating to a new revision + (fetchpatch { + url = "https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7.patch"; + hash = "sha256-RGokbQAwJAZm2FU2VNwraE3xko8E+RLLFjUfDRXeKhA="; + }) + ]; + # fix libasound.so/libpulse.so not being found preFixup = '' - ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"} - ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${finalAttrs.version}"} + ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${finalAttrs.version}"} ''; - passthru.tests = [ raylib-games ]; - meta = with lib; { description = "A simple and easy-to-use library to enjoy videogames programming"; homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; platforms = platforms.linux; - changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG"; + changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/rocfft/default.nix b/nixpkgs/pkgs/development/libraries/rocfft/default.nix index 325de9151b4b..d1136d4be8e6 100644 --- a/nixpkgs/pkgs/development/libraries/rocfft/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocfft/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-test"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/tests"; + sourceRoot = "${finalAttrs.src.name}/clients/tests"; nativeBuildInputs = [ cmake @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-benchmark"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/rider"; + sourceRoot = "${finalAttrs.src.name}/clients/rider"; nativeBuildInputs = [ cmake @@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-samples"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/samples"; + sourceRoot = "${finalAttrs.src.name}/clients/samples"; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index ffad392c6216..dda1a50ddc81 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -12,20 +12,19 @@ , windows , enableJemalloc ? false , jemalloc -, enableLite ? false , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support }: stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.10.2"; + version = "8.3.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; + sha256 = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; }; nativeBuildInputs = [ cmake ninja ]; @@ -68,7 +67,6 @@ stdenv.mkDerivation rec { "-DUSE_RTTI=1" "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere (lib.optional sse42Support "-DFORCE_SSE42=1") - (lib.optional enableLite "-DROCKSDB_LITE=1") "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; diff --git a/nixpkgs/pkgs/development/libraries/rustls-ffi/Cargo.lock b/nixpkgs/pkgs/development/libraries/rustls-ffi/Cargo.lock index dfa1b7ea9725..6cf2c532f33b 100644 --- a/nixpkgs/pkgs/development/libraries/rustls-ffi/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/rustls-ffi/Cargo.lock @@ -3,12 +3,6 @@ version = 3 [[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16,9 +10,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "cc" @@ -33,44 +27,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "memchr" @@ -96,14 +93,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "proc-macro-crate" @@ -117,18 +114,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -150,20 +147,20 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d" dependencies = [ "log", "ring", + "rustls-webpki", "rustversion", "sct", - "webpki", ] [[package]] name = "rustls-ffi" -version = "0.9.2" +version = "0.10.0" dependencies = [ "libc", "log", @@ -184,10 +181,20 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "sct" @@ -217,16 +224,27 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" dependencies = [ "indexmap", "toml_datetime", @@ -235,9 +253,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "untrusted" @@ -247,9 +265,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -257,24 +275,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.25", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -282,28 +300,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -343,9 +361,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" dependencies = [ "memchr", ] diff --git a/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix b/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix index 824e84e95103..46c16c9cc437 100644 --- a/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/rustls-ffi/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "rustls-ffi"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "rustls"; repo = pname; rev = "v${version}"; - hash = "sha256-urDC/Tm+ZwEbf0orZzKSET5ljQGVcKPGxscctKOM/FU="; + hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; }; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 6ee476ae9459..7655c4db254c 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.44"; + version = "1.3.46"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8YF9PhxTrXQBTUJvTrJZFDVijQecTeZ1ayGuvQRqGEE="; + sha256 = "sha256-X+ZwM53ensCeUoxNa8cBO4KcWxWbb7iKxIRysImvKxw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 8a6b72f52130..f35ff4c5ce58 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -1,15 +1,21 @@ -{ stdenv, lib, fetchurl, bzip2, zlib }: - -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchurl +, bzip2 +, curl +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { pname = "cfitsio"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "sha256-66U9Gz9uNFYyuwmnt1LsfO09Y+xRU6hIOA84gMXWGIk="; + url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; + hash = "sha256-/a3AHQnPn1QlOALF7IfrEN5RzkEwQRQVrojDCUBiG4s="; }; - buildInputs = [ bzip2 zlib ]; + buildInputs = [ bzip2 curl zlib ]; patches = [ ./darwin-rpath-universal.patch ]; @@ -22,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = with lib; { + meta = { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = @@ -35,8 +41,8 @@ stdenv.mkDerivation rec { FITS files. ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; - license = licenses.mit; - maintainers = with maintainers; [ xbreak hjones2199 ]; - platforms = with platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xbreak hjones2199 ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index cf722af9cbe1..7090e15dc3d7 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -12,17 +12,18 @@ , libjpeg , gsl , fftw +, gtest }: stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.8"; + version = "2.0.2"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-+KFuZgM/Bl6Oezq3WXjWCHefc1wvR3wOKXejmT0pw1U="; + hash = "sha256-GoEvWzGT3Ckv9Syif6Z2kAlnvg/Kt5I8SpGFG9kFTJo="; }; nativeBuildInputs = [ @@ -45,16 +46,24 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + ] ++ lib.optional doCheck [ + "-DINDI_BUILD_UNITTESTS=ON" + "-DINDI_BUILD_INTEGTESTS=ON" ]; + checkInputs = [ gtest ]; + + doCheck = true; + + # Socket address collisions between tests + enableParallelChecking = false; + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.unix; - # error: use of undeclared identifier 'MSG_NOSIGNAL' - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 7144a17c18b4..2423a6e20e34 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -17,6 +17,7 @@ , libdc1394 , gpsd , ffmpeg +, limesuite , version , src , withFirmware ? false @@ -33,22 +34,22 @@ stdenv.mkDerivation rec { buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw + limesuite ] ++ lib.optionals withFirmware [ firmware ]; postPatch = '' - for f in indi-qsi/CMakeLists.txt \ - indi-dsi/CMakeLists.txt \ - indi-armadillo-platypus/CMakeLists.txt \ - indi-orion-ssg3/CMakeLists.txt - do + for f in $(find . -name "CMakeLists.txt"); do substituteInPlace $f \ --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ --replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/lib/firmware" "lib/firmware" done + substituteInPlace libpktriggercord/CMakeLists.txt \ + --replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)" + sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12 ''; @@ -57,11 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d" - # Pentax, Atik, and SX cmakelists are currently broken - "-DWITH_PENTAX=off" - "-DWITH_ATIK=off" - "-DWITH_SX=off" ] ++ lib.optionals (!withFirmware) [ + "-DWITH_ATIK=off" "-DWITH_APOGEE=off" "-DWITH_DSI=off" "-DWITH_QHY=off" @@ -75,7 +73,7 @@ stdenv.mkDerivation rec { description = "Third party drivers for the INDI astronomical software suite"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 660433c2dd59..7875051cbf79 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -19,6 +19,7 @@ , ffmpeg , version , src +, autoPatchelfHook }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { inherit version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoPatchelfHook ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { description = "Third party firmware for the INDI astronomical software suite"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index fae8b95cb28c..6b110a152ee3 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,30 +1,29 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.8"; + inherit (indilib) version; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; - rev = "v${indi-version}"; - sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg="; + rev = "v${version}"; + hash = "sha256-xAGSFTOfO9P8JldzY59OnQULzf2Mlx3vWjoP+IDdEFE="; }; indi-firmware = callPackage ./indi-firmware.nix { - version = indi-version; + inherit version; src = indi-3rdparty-src; }; indi-3rdparty = callPackage ./indi-3rdparty.nix { - version = indi-version; + inherit version; src = indi-3rdparty-src; - withFirmware = stdenv.isx86_64; + withFirmware = stdenv.isx86_64 || stdenv.isAarch64; firmware = indi-firmware; }; in callPackage ./indi-with-drivers.nix { pname = "indi-full"; - version = indi-version; + inherit version; extraDrivers = [ indi-3rdparty - ] ++ lib.optionals stdenv.isx86_64 [ - indi-firmware - ]; + ] ++ lib.optional (stdenv.isx86_64 || stdenv.isAarch64) indi-firmware + ; } diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch b/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch new file mode 100644 index 000000000000..c26a2bbc8814 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nicolas Benes <nbenes.gh@xandea.de> +Date: Mon, 22 May 2023 09:25:27 +0200 +Subject: [PATCH] Fix pkg-config paths + + +diff --git a/libxisf.pc.in b/libxisf.pc.in +index b0b8b53..944b068 100644 +--- a/libxisf.pc.in ++++ b/libxisf.pc.in +@@ -1,7 +1,7 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + exec_prefix="${prefix}" +-libdir="${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" +-includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" ++libdir="@CMAKE_INSTALL_FULL_LIBDIR@" ++includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@" + + Name: @PROJECT_NAME@ + Description: @CMAKE_PROJECT_DESCRIPTION@ +-- +2.38.5 + diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix index e7e4bc98b0d8..a1fcd4da7b3d 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -10,16 +10,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.3"; + version = "0.2.8"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-u5EYnRO2rUV8ofLL9qfACeVvVbWXEXpkqh2Q4OOxpaQ="; + hash = "sha256-YB97vMz2+cFRYq8x2Su3Eh952U6kGIVLYV7kDEd5S8g="; }; + patches = [ + ./0001-Fix-pkg-config-paths.patch + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix index bea05468cedc..7c648ecba754 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.12"; + version = "8.1"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nPjeUOEJqX+gRRHUER6NFL0KRAdxMqz3PmzwAp/pa9Q="; + sha256 = "sha256-K/I+b6vRC4rs/6VEMb8lqiJP8BnGCp5naqVlYfm0Ep4="; }; nativeBuildInputs = [ flex ]; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix index 102cae24adb9..953fe50a4b03 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page"; + homepage = "https://github.com/BioPP/bpp-core"; changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog"; description = "C++ bioinformatics libraries and tools"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix index c11b49aa57eb..0b18dbfcf19a 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = bpp-core.meta // { + homepage = "https://github.com/BioPP/bpp-phyl"; changelog = "https://github.com/BioPP/bpp-phyl/blob/master/ChangeLog"; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix index 4b9a62eb762b..2cb89b4bbd38 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = bpp-core.meta // { + homepage = "https://github.com/BioPP/bpp-popgen"; changelog = "https://github.com/BioPP/bpp-popgen/blob/master/ChangeLog"; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix index 7981fb28ac09..2f6fbf9e362c 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = bpp-core.meta // { + homepage = "https://github.com/BioPP/bpp-seq"; changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index 2ad84249758a..a7c388339de0 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -11,7 +11,8 @@ , enableOpencl ? true , opencl-headers , ocl-icd -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudaPackages , addOpenGLRunpath }: diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index 57139f8bcd00..1f5e4b250a91 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -13,13 +13,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "simple-dftd3"; - version = "0.7.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; rev = "v${version}"; - hash = "sha256-5OvmMgjD8ujjKHkuw4NT8hEXKh5YPxuBl/Mu6g2/KIA="; + hash = "sha256-dfXiKKCGJ69aExSKpVC3Bp//COy256R9PDyxCNmDsfo="; }; nativeBuildInputs = [ cmake gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/science/electronics/coloquinte/default.nix b/nixpkgs/pkgs/development/libraries/science/electronics/coloquinte/default.nix new file mode 100644 index 000000000000..6946080c100e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/electronics/coloquinte/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, lemon-graph +, eigen +, boost +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "coloquinte"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "coloquinte"; + repo = "PlaceRoute"; + rev = finalAttrs.version; + hash = "sha256-bPDXaNZCNBM0qiu+46cL/zH/41lwqHPqfqTzJaERgVQ="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + lemon-graph + eigen + boost + ]; + + meta = { + description = "Placement library for electronic circuits"; + homepage = "https://github.com/Coloquinte/PlaceRoute"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.coloquinte ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix index 281076caba9f..23d749f1b297 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clblast"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "CNugteren"; repo = "CLBlast"; rev = version; - hash = "sha256-eRwSfP6p0+9yql7TiXZsExRMcnnBLXXW2hh1JliYU2I="; + hash = "sha256-1ddjmoLhFoLi/z2cae0HZidUTySsZQDk1T8MVPTbfi4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index cdfa924b2242..e0a6ffd9d547 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,6 +94,7 @@ in # 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 ''; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix index 2175d1343856..5a9d3c5066cc 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dbcsr"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cp2k"; repo = "dbcsr"; rev = "v${version}"; - hash = "sha256-GGClK3heGE3zUM0R+u58vRdAK+xWzaqdCHaMIDerHSI="; + hash = "sha256-+xSxfrzsxBdb424F/3mIETleEPoETxU0LB0OBJrR7gw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix index d67f31375e7d..21e6cbf858cd 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -5,7 +5,7 @@ , stdenv , cmake , cudaPackages ? { } -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , nvidia-thrust , useThrustSourceBuild ? true , pythonSupport ? true diff --git a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix index ae5beb0f09e6..6fa8567355a9 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix @@ -1,6 +1,6 @@ -{lib, stdenv, fetchurl, gmp}: +{ lib, stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lrs"; version = "7.2"; @@ -11,14 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - preBuild = '' - export makeFlags="$makeFlags prefix=$out"; - ''; + makeFlags = [ + "prefix=${placeholder "out"}" + "CC:=$(CC)" + ]; meta = { description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; - license = lib.licenses.gpl2 ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html"; }; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 49efda96829c..04f263568ce6 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -28,6 +28,7 @@ , ninja , openmp , rocmSupport ? false +, static ? false , stdenv , symlinkJoin }: @@ -85,29 +86,6 @@ let # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 "${minArch'}0"; - cuda-common-redist = with cudaPackages; [ - libcublas # cublas_v2.h - libcusparse # cusparse.h - ]; - - # Build-time dependencies - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # <cuda_profiler_api.h> - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # <cuda_profiler_api.h> - ] ++ cuda-common-redist; - }; - - # Run-time dependencies - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; @@ -127,16 +105,22 @@ stdenv.mkDerivation { ninja gfortran ] ++ lists.optionals cudaSupport [ - cuda-native-redist + cudaPackages.cuda_nvcc ]; buildInputs = [ libpthreadstubs lapack blas - ] ++ lists.optionals cudaSupport [ - cuda-redist - ] ++ lists.optionals rocmSupport [ + ] ++ lists.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + libcublas # cublas_v2.h + libcusparse # cusparse.h + ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + cuda_nvprof # <cuda_profiler_api.h> + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + cuda_profiler_api # <cuda_profiler_api.h> + ]) ++ lists.optionals rocmSupport [ hip hipblas hipsparse @@ -145,6 +129,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DGPU_TARGET=${gpuTargetString}" + ] ++ lists.optionals static [ + "-DBUILD_SHARED_LIBS=OFF" ] ++ lists.optionals cudaSupport [ "-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}" "-DMIN_ARCH=${minArch}" # Disarms magma's asserts diff --git a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix index e48658b19b82..691140dbf847 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix @@ -1,17 +1,16 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , blas }: let - suitesparseVersion = "7.0.1"; + suitesparseVersion = "7.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mongoose"; - version = "3.0.4"; + version = "3.0.5"; outputs = [ "bin" "out" "dev" ]; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${suitesparseVersion}"; - hash = "sha256-EIreweeOx44YDxlnxnJ7l31Ie1jSx6y87VAyEX+4NsQ="; + hash = "sha256-UizybioU1J01PLBpu+PfnSzWScGTvMuJN5j9PjuZRwE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 06494a1dddcb..6589fc0b9b64 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.19.1"; + version = "3.19.2"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-dNtgxTyAtI1cOeB7w5qIPsztiLnySl3hfPb0hakD4SA="; + sha256 = "sha256-EU82P3ebsWg5slwOcPiwrg2UfVDnL3xs3csRsAEHmxY="; }; mpiSupport = !withp4est || p4est.mpiSupport; diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 95eeaeb8abf3..cbc24b154656 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, gfortran, blas, lapack -, enableCuda ? false, cudatoolkit +, config +, enableCuda ? config.cudaSupport, cudatoolkit }: let diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index 51b55592d42e..67dfef186e7d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -6,7 +6,8 @@ , fixDarwinDylibNames , gmp , mpfr -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit }: diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 3426b0149ae0..1ac08ce0cd2f 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -1,203 +1,104 @@ { stdenv , bash -, abseil-cpp +, buildPackages +, buildBazelPackage , fetchFromGitHub -, fetchFromGitLab -, fetchpatch -, fetchurl -, flatbuffers , lib -, zlib }: let - tflite-eigen = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = "3d9051ea84a5089b277c88dac456b3b1576bfa7f"; - sha256 = "1y3f2jvimb5i904f4n37h23cv2pkdlbz8656s0kga1y7c0p50wif"; - }; - - gemmlowp-src = fetchFromGitHub { - owner = "google"; - repo = "gemmlowp"; - rev = "fda83bdc38b118cc6b56753bd540caa49e570745"; - sha256 = "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"; - }; - - neon-2-sse-src = fetchFromGitHub { - owner = "intel"; - repo = "ARM_NEON_2_x86_SSE"; - rev = "1200fe90bb174a6224a525ee60148671a786a71f"; - sha256 = "0fhxch711ck809dpq1myxz63jiiwfcnxvj45ww0kg8s0pqpn5kv6"; - }; - - farmhash-src = fetchFromGitHub { - owner = "google"; - repo = "farmhash"; - rev = "816a4ae622e964763ca0862d9dbd19324a1eaf45"; - sha256 = "1mqxsljq476n1hb8ilkrpb39yz3ip2hnc7rhzszz4sri8ma7qzp6"; - }; - - fft2d-src = fetchurl { - url = "http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz"; - sha256 = "ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9"; - }; - - fp16-src = fetchFromGitHub { - owner = "Maratyszcza"; - repo = "FP16"; - rev = "4dfe081cf6bcd15db339cf2680b9281b8451eeb3"; - sha256 = "06a8dfl3a29r93nxpp6hpywsajz5d555n3sqd3i6krybb6swnvh7"; - }; - - ruy-src = fetchFromGitHub { - owner = "google"; - repo = "ruy"; - rev = "23633b37099b614a2f836ef012cafc8087fdb98c"; - sha256 = "14k9hz6ss8qy8nsajk6lrq25f6qxrldxky31ijw0dpqnfnnswrx4"; - }; - - cpuinfo-src = fetchFromGitHub { - owner = "pytorch"; - repo = "cpuinfo"; - rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; - sha256 = "0q6760xdxsg18acdv8vq3yrq7ksr7wsm8zbyan01zf2khnb6fw4x"; + buildPlatform = stdenv.buildPlatform; + hostPlatform = stdenv.hostPlatform; + pythonEnv = buildPackages.python3.withPackages (ps: [ ps.numpy ]); + bazelDepsSha256ByBuildAndHost = { + x86_64-linux = { + x86_64-linux = "sha256-61qmnAB80syYhURWYJOiOnoGOtNa1pPkxfznrFScPAo="; + aarch64-linux = "sha256-sOIYpp98wJRz3RGvPasyNEJ05W29913Lsm+oi/aq/Ag="; + }; + aarch64-linux = { + aarch64-linux = "sha256-MJU4y9Dt9xJWKgw7iKW+9Ur856rMIHeFD5u05s+Q7rQ="; + }; }; + bazelHostConfigName.aarch64-linux = "elinux_aarch64"; + bazelDepsSha256ByHost = + bazelDepsSha256ByBuildAndHost.${buildPlatform.system} or + (throw "unsupported build system ${buildPlatform.system}"); + bazelDepsSha256 = bazelDepsSha256ByHost.${hostPlatform.system} or + (throw "unsupported host system ${hostPlatform.system} with build system ${buildPlatform.system}"); in -stdenv.mkDerivation rec { - pname = "tensorflow-lite"; - version = "2.5.0"; +buildBazelPackage rec { + name = "tensorflow-lite"; + version = "2.13.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l"; + hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0="; }; - patches = [ - # TODO: remove on the next version bump - (fetchpatch { - name = "include-schema-conversion-utils-source.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch"; - sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k"; - }) - # TODO: remove on the next version bump - (fetchpatch { - name = "cxxstandard-var.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/9b128ae4200e10b4752f903492d1e7d11957ed5c.patch"; - sha256 = "1q0izdwdji5fbyqll6k4dmkzfykyvvz5cvc6hysdj285nkn2wy6h"; - }) + bazel = buildPackages.bazel_5; + + nativeBuildInputs = [ pythonEnv buildPackages.perl ]; + + bazelTargets = [ + "//tensorflow/lite:libtensorflowlite.so" + "//tensorflow/lite/c:tensorflowlite_c" + "//tensorflow/lite/tools/benchmark:benchmark_model" + "//tensorflow/lite/tools/benchmark:benchmark_model_performance_options" ]; - buildInputs = [ zlib flatbuffers ]; + bazelFlags = [ + "--config=opt" + ] ++ lib.optionals (hostPlatform.system != buildPlatform.system) [ + "--config=${bazelHostConfigName.${hostPlatform.system}}" + ]; - dontConfigure = true; + bazelBuildFlags = [ "--cxxopt=--std=c++17" ]; - postPatch = '' - substituteInPlace ./tensorflow/lite/tools/make/Makefile \ - --replace /bin/bash ${bash}/bin/bash \ - --replace /bin/sh ${bash}/bin/sh - ''; + buildAttrs = { + installPhase = '' + mkdir -p $out/{bin,lib} + + # copy the libs and binaries into the output dir + cp ./bazel-bin/tensorflow/lite/c/libtensorflowlite_c.so $out/lib + cp ./bazel-bin/tensorflow/lite/libtensorflowlite.so $out/lib + cp ./bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model $out/bin + cp ./bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model_performance_options $out/bin - makefile = "tensorflow/lite/tools/make/Makefile"; - - preBuild = - let - includes = - lib.concatMapStringsSep - " " - (subdir: "-I $PWD/tensorflow/lite/tools/make/downloads/${subdir}") - [ - "neon_2_sse" - "gemmlowp" - "absl" - "fp16/include" - "farmhash/src" - "ruy" - "cpuinfo" - "cpuinfo/src" - "cpuinfo/include" - "cpuinfo/deps/clog/include" - "eigen" - ]; - in - '' - # enter the vendoring lair of doom - - prefix="$PWD/tensorflow/lite/tools/make/downloads" - - mkdir -p "$prefix" - - tar xzf ${fft2d-src} -C "$prefix" - - ln -s ${ruy-src} "$prefix/ruy" - ln -s ${gemmlowp-src} "$prefix/gemmlowp" - ln -s ${neon-2-sse-src} "$prefix/neon_2_sse" - ln -s ${farmhash-src} "$prefix/farmhash" - ln -s ${cpuinfo-src} "$prefix/cpuinfo" - ln -s ${fp16-src} "$prefix/fp16" - ln -s ${tflite-eigen} "$prefix/eigen" - - # tensorflow lite is using the *source* of flatbuffers - ln -s ${flatbuffers.src} "$prefix/flatbuffers" - - # tensorflow lite expects to compile abseil into `libtensorflow-lite.a` - ln -s ${abseil-cpp.src} "$prefix/absl" - - # set CXXSTANDARD=c++17 here because abseil-cpp in nixpkgs is set as - # such and would be used in dependents like libedgetpu - buildFlagsArray+=( - INCLUDES="-I $PWD ${includes}" - CXXSTANDARD="-std=c++17" - TARGET_TOOLCHAIN_PREFIX="" - -j$NIX_BUILD_CORES - all) + find . -type f -name '*.h' | while read f; do + path="$out/include/''${f/.\//}" + install -D "$f" "$path" + + # remove executable bit from headers + chmod -x "$path" + done ''; + }; + + fetchAttrs.sha256 = bazelDepsSha256; - installPhase = '' - mkdir "$out" + PYTHON_BIN_PATH = pythonEnv.interpreter; - # copy the static lib and binaries into the output dir - cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out" + dontAddBazelOpts = true; + removeRulesCC = false; - find ./tensorflow/lite -type f -name '*.h' | while read f; do - path="$out/include/''${f/.\//}" - install -D "$f" "$path" + postPatch = '' + rm .bazelversion + ''; - # remove executable bit from headers - chmod -x "$path" - done + preConfigure = '' + patchShebangs configure ''; + # configure script freaks out when parameters are passed + dontAddPrefix = true; + configurePlatforms = []; + meta = with lib; { description = "An open source deep learning framework for on-device inference."; homepage = "https://www.tensorflow.org/lite"; license = licenses.asl20; - maintainers = with maintainers; [ cpcloud ]; + maintainers = with maintainers; [ mschwaig cpcloud ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - knownVulnerabilities = [ - # at least some of - "CVE-2023-27579" - "CVE-2023-25801" - "CVE-2023-25676" - "CVE-2023-25675" - "CVE-2023-25674" - "CVE-2023-25673" - "CVE-2023-25671" - "CVE-2023-25670" - "CVE-2023-25669" - "CVE-2023-25668" - "CVE-2023-25667" - "CVE-2023-25665" - "CVE-2023-25666" - "CVE-2023-25664" - "CVE-2023-25663" - "CVE-2023-25662" - "CVE-2023-25660" - "CVE-2023-25659" - "CVE-2023-25658" - # and many many more - ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index ef501dfd09a0..d046c6864539 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -1,20 +1,20 @@ -{ cmake -, cudaPackages -, fetchFromGitHub -, lib -, ninja -, pkgs -, python3Packages ? { } -, pythonSupport ? false -, stdenv -, symlinkJoin -, which -}: -let +{ + cmake, + cudaPackages, + fetchFromGitHub, + lib, + ninja, + python3Packages ? {}, + pythonSupport ? false, + stdenv, + symlinkJoin, + which, +}: let inherit (lib) lists strings; inherit (cudaPackages) backendStdenv cudaFlags; cuda-common-redist = with cudaPackages; [ + cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h libcusolver # cusolverDn.h libcusparse # cusparse.h @@ -22,10 +22,9 @@ let cuda-native-redist = symlinkJoin { name = "cuda-redist"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ cuda-common-redist; + paths = with cudaPackages; + [cuda_nvcc] + ++ cuda-common-redist; }; cuda-redist = symlinkJoin { @@ -33,120 +32,127 @@ let paths = cuda-common-redist; }; in -stdenv.mkDerivation (finalAttrs: { - name = "tiny-cuda-nn"; - version = "1.6"; - - format = strings.optionalString pythonSupport "setuptools"; - - src = fetchFromGitHub { - owner = "NVlabs"; - repo = finalAttrs.name; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; - }; - - nativeBuildInputs = [ - cmake - cuda-native-redist - ninja - which - ] ++ lists.optionals pythonSupport (with python3Packages; [ - pip - setuptools - wheel - ]); - - buildInputs = [ - cuda-redist - ] ++ lib.optionals pythonSupport ( - with python3Packages; [ - pybind11 - python - ] - ); - - propagatedBuildInputs = lib.optionals pythonSupport ( - with python3Packages; [ - torch - ] - ); - - # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately - # initailize CUDA and GPU access is not allowed in the nix build environment. - # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check - # phase -- we're not missing anything. - doCheck = false; - - preConfigure = '' - export TCNN_CUDA_ARCHITECTURES=${ - strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) - } - export CUDA_HOME=${cuda-native-redist} - export LIBRARY_PATH=${cuda-native-redist}/lib/stubs:$LIBRARY_PATH - export CC=${backendStdenv.cc}/bin/cc - export CXX=${backendStdenv.cc}/bin/c++ - ''; - - # When building the python bindings, we cannot re-use the artifacts from the C++ build so we - # skip the CMake confurePhase and the buildPhase. - dontUseCmakeConfigure = pythonSupport; - - # The configurePhase usually puts you in the build directory, so for the python bindings we - # need to change directories to the source directory. - configurePhase = strings.optionalString pythonSupport '' - runHook preConfigure - mkdir -p $NIX_BUILD_TOP/build - cd $NIX_BUILD_TOP/build - runHook postConfigure - ''; - - buildPhase = strings.optionalString pythonSupport '' - runHook preBuild - python -m pip wheel \ - --no-build-isolation \ - --no-clean \ - --no-deps \ - --no-index \ - --verbose \ - --wheel-dir $NIX_BUILD_TOP/build \ - $NIX_BUILD_TOP/source/bindings/torch - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib - '' - # Installing the C++ library just requires copying the static library to the output directory - + strings.optionalString (!pythonSupport) '' - cp libtiny-cuda-nn.a $out/lib/ - '' - # Installing the python bindings requires building the wheel and installing it - + strings.optionalString pythonSupport '' - python -m pip install \ - --no-build-isolation \ - --no-cache-dir \ - --no-deps \ - --no-index \ - --no-warn-script-location \ - --prefix="$out" \ - --verbose \ - ./*.whl - '' + '' - runHook postInstall - ''; - - passthru = { - inherit cudaPackages; - }; - - meta = with lib; { - description = "Lightning fast C++/CUDA neural network framework"; - homepage = "https://github.com/NVlabs/tiny-cuda-nn"; - license = licenses.bsd3; - maintainers = with maintainers; [ connorbaker ]; - platforms = platforms.linux; - }; -}) + stdenv.mkDerivation (finalAttrs: { + pname = "tiny-cuda-nn"; + version = "1.6"; + strictDeps = true; + + format = strings.optionalString pythonSupport "setuptools"; + + src = fetchFromGitHub { + owner = "NVlabs"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; + }; + + nativeBuildInputs = + [ + cmake + cuda-native-redist + ninja + which + ] + ++ lists.optionals pythonSupport (with python3Packages; [ + pip + setuptools + wheel + ]); + + buildInputs = + [ + cuda-redist + ] + ++ lib.optionals pythonSupport ( + with python3Packages; [ + pybind11 + python + ] + ); + + propagatedBuildInputs = lib.optionals pythonSupport ( + with python3Packages; [ + torch + ] + ); + + # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately + # initailize CUDA and GPU access is not allowed in the nix build environment. + # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check + # phase -- we're not missing anything. + doCheck = false; + + preConfigure = '' + export TCNN_CUDA_ARCHITECTURES="${ + strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) + }" + export CUDA_HOME="${cuda-native-redist}" + export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" + export CC="${backendStdenv.cc}/bin/cc" + export CXX="${backendStdenv.cc}/bin/c++" + ''; + + # When building the python bindings, we cannot re-use the artifacts from the C++ build so we + # skip the CMake confurePhase and the buildPhase. + dontUseCmakeConfigure = pythonSupport; + + # The configurePhase usually puts you in the build directory, so for the python bindings we + # need to change directories to the source directory. + configurePhase = strings.optionalString pythonSupport '' + runHook preConfigure + mkdir -p "$NIX_BUILD_TOP/build" + cd "$NIX_BUILD_TOP/build" + runHook postConfigure + ''; + + buildPhase = strings.optionalString pythonSupport '' + runHook preBuild + python -m pip wheel \ + --no-build-isolation \ + --no-clean \ + --no-deps \ + --no-index \ + --verbose \ + --wheel-dir "$NIX_BUILD_TOP/build" \ + "$NIX_BUILD_TOP/source/bindings/torch" + runHook postBuild + ''; + + installPhase = + '' + runHook preInstall + mkdir -p "$out/lib" + '' + # Installing the C++ library just requires copying the static library to the output directory + + strings.optionalString (!pythonSupport) '' + cp libtiny-cuda-nn.a "$out/lib/" + '' + # Installing the python bindings requires building the wheel and installing it + + strings.optionalString pythonSupport '' + python -m pip install \ + --no-build-isolation \ + --no-cache-dir \ + --no-deps \ + --no-index \ + --no-warn-script-location \ + --prefix="$out" \ + --verbose \ + ./*.whl + '' + + '' + runHook postInstall + ''; + + passthru = { + inherit cudaPackages; + }; + + meta = with lib; { + description = "Lightning fast C++/CUDA neural network framework"; + homepage = "https://github.com/NVlabs/tiny-cuda-nn"; + license = licenses.bsd3; + maintainers = with maintainers; [connorbaker]; + platforms = platforms.linux; + }; + }) diff --git a/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix index 0eba41234fd5..f515253026b8 100644 --- a/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -1,77 +1,108 @@ { stdenv +, breakpointHook , fetchFromGitLab , python -, wafHook +, libxml2 +, sqlite -# for binding generation -, castxml ? null +, boost +, gtk3-x11 +, root +, glib +, gsl -# can take a long time, generates > 30000 images/graphs -, enableDoxygen ? false +, cmake +, pkg-config + + +, libpcap -# e.g. "optimized" or "debug". If not set, use default one -, build_profile ? null +, jansson -# --enable-examples -, withExamples ? false +, harfbuzz +, freetype -# very long -, withManual ? false, doxygen ? null, graphviz ? null, imagemagick ? null -# for manual, tetex is used to get the eps2pdf binary -# texlive to get latexmk. building manual still fails though -, dia, tetex ? null, ghostscript ? null, texlive ? null + # for binding generation +, castxml ? null +, cppyy ? null + + # can take a long time, generates > 30000 images/graphs +, enableDoxygen ? false -# generates python bindings -, pythonSupport ? false, ncurses ? null + # very long +, withManual ? false +, doxygen ? null +, graphviz ? null +, imagemagick ? null + # for manual, tetex is used to get the eps2pdf binary + # texlive to get latexmk. building manual still fails though +, dia +, tetex ? null +, ghostscript ? null +, texlive ? null + + # generates python bindings +, pythonSupport ? true +, ncurses ? null -# All modules can be enabled by choosing 'all_modules'. -# we include here the DCE mandatory ones -, modules ? [ "core" "network" "internet" "point-to-point" "point-to-point-layout" "fd-net-device" "netanim" ] , lib }: let - pythonEnv = python.withPackages(ps: + pythonEnv = python.withPackages (ps: lib.optional withManual ps.sphinx - ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) + ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml cppyy]) ); in stdenv.mkDerivation rec { pname = "ns-3"; - version = "35"; + version = "39"; src = fetchFromGitLab { owner = "nsnam"; - repo = "ns-3-dev"; - rev = "ns-3.${version}"; - sha256 = "sha256-3w+lCWWra9sndL8+vkGfH5plrDYYCMFi1PzwIVRku6I="; + repo = "ns-3-dev"; + rev = "ns-3.${version}"; + sha256 = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; }; - nativeBuildInputs = [ wafHook python ]; + nativeBuildInputs = [ cmake pkg-config pythonEnv ]; - outputs = [ "out" ] ++ lib.optional pythonSupport "py"; + outputs = [ "out" ]; # ncurses is a hidden dependency of waf when checking python buildInputs = lib.optionals pythonSupport [ castxml ncurses ] ++ lib.optionals enableDoxygen [ doxygen graphviz imagemagick ] - ++ lib.optionals withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; + ++ lib.optionals withManual [ dia tetex ghostscript imagemagick texlive.combined.scheme-medium ] + ++ [ + libxml2 + pythonEnv + sqlite.dev + gsl + boost + root + glib.out + glib.dev + libpcap + gtk3-x11.dev + harfbuzz + freetype + jansson + ]; propagatedBuildInputs = [ pythonEnv ]; - postPatch = '' - patchShebangs doc/ns3_html_theme/get_version.sh - ''; + preConfigure = '' + substituteInPlace src/tap-bridge/CMakeLists.txt \ + --replace '-DTAP_CREATOR="''${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/tap-bridge/' "-DTAP_CREATOR=\"$out/libexec/ns3/" - wafConfigureFlags = with lib; [ - "--enable-modules=${concatStringsSep "," modules}" - "--with-python=${pythonEnv.interpreter}" - ] - ++ optional (build_profile != null) "--build-profile=${build_profile}" - ++ optional withExamples " --enable-examples " - ++ optional doCheck " --enable-tests " - ; + substituteInPlace src/fd-net-device/CMakeLists.txt \ + --replace '-DRAW_SOCK_CREATOR="''${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/fd-net-device/' "-DRAW_SOCK_CREATOR=\"$out/libexec/ns3/" + + substituteInPlace src/fd-net-device/CMakeLists.txt \ + --replace '-DTAP_DEV_CREATOR="''${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/fd-net-device/' "-DTAP_DEV_CREATOR=\"$out/libexec/ns3/" + ''; - doCheck = true; + doCheck = false; buildTargets = "build" + lib.optionalString enableDoxygen " doxygen" @@ -80,25 +111,25 @@ stdenv.mkDerivation rec { # to prevent fatal error: 'backward_warning.h' file not found CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; - postBuild = with lib; let flags = concatStringsSep ";" ( - optional enableDoxygen "./waf doxygen" - ++ optional withManual "./waf sphinx" - ); - in "${flags}" - ; - - postInstall = '' - moveToOutput "${pythonEnv.libPrefix}" "$py" - ''; - - # we need to specify the proper interpreter else ns3 can check against a - # different version - checkPhase = '' - ${pythonEnv.interpreter} ./test.py --nowaf - ''; + # Make generated python bindings discoverable in customized python environment + passthru = { pythonModule = python; }; + + cmakeFlags = [ + "-DPython3_LIBRARY_DIRS=${pythonEnv}/lib" + "-DPython3_INCLUDE_DIRS=${pythonEnv}/include" + "-DPython3_EXECUTABLE=${pythonEnv}/bin/python" + "-DNS3_PYTHON_BINDINGS=ON" + "-DNS3_DES_METRICS=ON" + "-DNS3_BINDINGS_INSTALL_DIR=lib/${pythonEnv.libPrefix}/site-packages" + "-DNS3_LOG=ON" + "-DNS3_ASSERT=ON" + "-DNS3_GTK3=ON" + "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + ] + ++ lib.optional doCheck "-DNS3_TESTS=ON"; # strictoverflow prevents clang from discovering pyembed when bindings - hardeningDisable = [ "fortify" "strictoverflow"]; + hardeningDisable = [ "fortify" "strictoverflow" ]; meta = with lib; { homepage = "http://www.nsnam.org"; diff --git a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 7857c6e42db6..9f6ac99c6f02 100644 --- a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-GefuMsMFmNyAn+xmnRqUjyWFHqiF/kIzqBCF6mk3vx0="; + hash = "sha256-x9xqcQQQS6hUcZaF8Ei8OmDXUP+y3prVyjlzwm4+4ko="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/serf/default.nix b/nixpkgs/pkgs/development/libraries/serf/default.nix index 2d46e6f5e0e4..1a2f407f9bc2 100644 --- a/nixpkgs/pkgs/development/libraries/serf/default.nix +++ b/nixpkgs/pkgs/development/libraries/serf/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5 -, pkg-config, libiconv -, fetchpatch }: +{ lib +, stdenv +, fetchurl +, apr +, scons +, openssl +, aprutil +, zlib +, libkrb5 +, pkg-config +, libiconv +, fetchpatch +}: stdenv.mkDerivation rec { pname = "serf"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { url = "mirror://apache/serf/${pname}-${version}.tar.bz2"; - sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; + hash = "sha256-voHvCLqiUW7Np2p3rffe97wyJ+61eLmjO0X3tB3AZOY="; }; nativeBuildInputs = [ pkg-config scons ]; @@ -17,11 +27,7 @@ stdenv.mkDerivation rec { patches = [ ./scons.patch - # https://issues.apache.org/jira/projects/SERF/issues/SERF-198 - (fetchpatch { - url = "https://issues.apache.org/jira/secure/attachment/13019945/serf.patch"; - hash = "sha256-3djDGG30R/gq74KJL8OJ/upMh1zDpqtwGylRzN0lXpY="; - }) + (fetchpatch { url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch"; hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4="; @@ -44,6 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HTTP client library based on APR"; + homepage = "https://serf.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ orivej raskin ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/serf/scons.patch b/nixpkgs/pkgs/development/libraries/serf/scons.patch index 5f168ce7f2eb..7be5e4d5045d 100644 --- a/nixpkgs/pkgs/development/libraries/serf/scons.patch +++ b/nixpkgs/pkgs/development/libraries/serf/scons.patch @@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct index 4358a23..6ce7776 100644 --- a/SConstruct +++ b/SConstruct -@@ -55,7 +55,7 @@ def RawListVariable(key, help, default): - # To be used to ensure a PREFIX directory is only created when installing. - def createPathIsDirCreateWithTarget(target): - def my_validator(key, val, env): -- build_targets = (map(str, BUILD_TARGETS)) -+ build_targets = (list(map(str, BUILD_TARGETS))) - if target in build_targets: - return PathVariable.PathIsDirCreate(key, val, env) - else: @@ -155,6 +155,8 @@ if sys.platform == 'win32': env = Environment(variables=opts, tools=('default', 'textfile',), @@ -20,25 +11,3 @@ index 4358a23..6ce7776 100644 ) env.Append(BUILDERS = { -@@ -163,9 +164,9 @@ env.Append(BUILDERS = { - suffix='.def', src_suffix='.h') - }) - --match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' -- 'SERF_MINOR_VERSION ([0-9]+).*' -- 'SERF_PATCH_VERSION ([0-9]+)', -+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' -+ b'SERF_MINOR_VERSION ([0-9]+).*' -+ b'SERF_PATCH_VERSION ([0-9]+)', - env.File('serf.h').get_contents(), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] -@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) - - unknown = opts.UnknownVariables() - if unknown: -- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) -+ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys()))) - - apr = str(env['APR']) - apu = str(env['APU']) diff --git a/nixpkgs/pkgs/development/libraries/sexpp/default.nix b/nixpkgs/pkgs/development/libraries/sexpp/default.nix new file mode 100644 index 000000000000..dd41d520d28c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sexpp/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, bzip2 +, cmake +, fetchFromGitHub +, gtest +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sexpp"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "rnpgp"; + repo = "sexpp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-E1ESN3JKCWYBt1o37d7EVcgARnwGKS6mxua+0m1RMlM="; + }; + + buildInputs = [ zlib bzip2 ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DBUILD_SHARED_LIBS=on" + "-DWITH_SEXP_TESTS=on" + "-DDOWNLOAD_GTEST=off" + "-DWITH_SEXP_CLI=on" + "-DWITH_SANITIZERS=off" + ]; + + nativeBuildInputs = [ cmake gtest pkg-config ]; + + outputs = [ "out" "lib" "dev" ]; + + preConfigure = '' + echo "v${finalAttrs.version}" > version.txt + ''; + + meta = with lib; { + homepage = "https://github.com/rnpgp/sexp"; + description = "S-expressions parser and generator C++ library, fully compliant to [https://people.csail.mit.edu/rivest/Sexp.txt]"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ ribose-jeffreylau ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index 495a5ba04f07..5e7358fa15f9 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { buildInputs = [ freetype ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + postPatch = '' + # disable broken 'nametabletest' test, fails on gcc-13: + # https://github.com/silnrsi/graphite/pull/74 + substituteInPlace tests/CMakeLists.txt \ + --replace 'add_subdirectory(nametabletest)' '#add_subdirectory(nametabletest)' + ''; cmakeFlags = lib.optionals static [ "-DBUILD_SHARED_LIBS=OFF" diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index feb9c1ad071f..65028888902a 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.1.8"; + version = "3.2.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-j13yNzh9CnniXzjoB4oNtDwYcao6MOVgyWo9JtqT/yQ="; + sha256 = "sha256-JJFHRoG/w5PLSrn99i4EUjRtbNUYDF19/xlsYOwwFZA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix index bd372a562768..0ef61ca360bf 100644 --- a/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi -, libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut +, libICE, libSM, libXt, libXmu, libGLU, libGL, boost179, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr, xz , curl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ plib freeglut xorgproto libX11 libXext libXi - libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut + libICE libSM libXt libXmu libGLU libGL boost179 zlib libjpeg freealut openscenegraph openal expat apr curl xz ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix index 56c4eccf434c..91c32b5dd3a8 100644 --- a/nixpkgs/pkgs/development/libraries/slib/default.nix +++ b/nixpkgs/pkgs/development/libraries/slib/default.nix @@ -1,25 +1,35 @@ -{ fetchurl, lib, stdenv, unzip, scheme, texinfo }: +{ lib, stdenv, fetchurl, scheme, texinfo, unzip }: stdenv.mkDerivation rec { pname = "slib"; - version = "3b5"; + version = "3b7"; src = fetchurl { url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; - sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; + hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY="; }; - patches = [ ./catalog-in-library-vicinity.patch ]; + patches = [ + ./catalog-in-library-vicinity.patch + ]; - nativeBuildInputs = [ unzip ]; - buildInputs = [ scheme texinfo ]; + # slib:require unsupported feature color-database + postPatch = '' + substituteInPlace Makefile \ + --replace " clrnamdb.scm" "" + ''; + + nativeBuildInputs = [ scheme texinfo unzip ]; + buildInputs = [ scheme ]; postInstall = '' ln -s mklibcat{.scm,} SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs - sed -i "$out/bin/slib" \ - -e "/^SCHEME_LIBRARY_PATH/i export PATH=\"${scheme}/bin:\$PATH\"" + sed -i \ + -e '2i export PATH="${scheme}/bin:$PATH"' \ + -e '3i export GUILE_AUTO_COMPILE=0' \ + $out/bin/slib ''; # There's no test suite (?!). diff --git a/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/nixpkgs/pkgs/development/libraries/smpeg/default.nix index 5c72d653278d..f25ac14df864 100644 --- a/nixpkgs/pkgs/development/libraries/smpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/smpeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; - buildInputs = [ SDL gtk2 libGLU libGL ]; + buildInputs = [ SDL ] ++ lib.optionals (!stdenv.isDarwin) [ gtk2 libGLU libGL ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index f0f9596f95dd..0a7f5ac91eaa 100644 --- a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-IGQQBSyh8hjZuymmRtU4FI2n7FyYmP28Nun9eorvAHY="; + sha256 = "sha256-CgjsJJ3Z/7s7FtV3s1LVc1YfV77uw1lhgqxuyORrmrY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index 223bbec1d4e4..f2f9b6ec8859 100644 --- a/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.15"; + version = "1.13.16"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mDcXr9JPYtuz2EtonoeuimH1VsEKbNr/Q0gs+a7azTU="; + sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/nixpkgs/pkgs/development/libraries/sonivox/default.nix b/nixpkgs/pkgs/development/libraries/sonivox/default.nix index a4ee0dd71144..3ad01725966c 100644 --- a/nixpkgs/pkgs/development/libraries/sonivox/default.nix +++ b/nixpkgs/pkgs/development/libraries/sonivox/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sonivox"; - version = "3.6.11"; + version = "3.6.12"; src = fetchFromGitHub { owner = "pedrolcl"; repo = pname; rev = "v${version}"; - hash = "sha256-kCMY9A16g+CNNPn4PZ80QdEP6f58zCI3fQ1BFiK1ZQg="; + hash = "sha256-df3EwscTF9n1fazz5Oa3FIXgWXHruhJBzMt8Y+ELP94="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 01a472f8e766..fe648a2ce7bf 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +# Although we include upstream patches that fix compilation with fmt_10, we +# still use fmt_9 because this dependency is propagated, and many of spdlog's +# reverse dependencies don't support fmt_10 yet. +, fmt_9 , staticBuild ? stdenv.hostPlatform.isStatic + +# tests +, bear, tiledb }: stdenv.mkDerivation rec { @@ -13,8 +24,20 @@ stdenv.mkDerivation rec { hash = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05.patch"; + hash = "sha256-cRsQilkyUQW47PFpDwKgU/pm+tOeLvwPx32gNOPAO1U="; + }) + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/af1785b897c9d1098d4aa7213fad232be63c19b4.patch"; + hash = "sha256-zpfLiBeDAOsvk4vrIyXC0kvFe2WkhAhersd+fhA8DFY="; + }) + ]; + nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ fmt ]; + propagatedBuildInputs = [ fmt_9 ]; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" @@ -34,6 +57,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit bear tiledb; + }; + meta = with lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; diff --git a/nixpkgs/pkgs/development/libraries/speechd/default.nix b/nixpkgs/pkgs/development/libraries/speechd/default.nix index 962d056ce7dd..16bc36a78124 100644 --- a/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let inherit (python3Packages) python pyxdg wrapPython; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.11.2"; + version = "0.11.4"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-i0ZJkl5oy+GntMCge7BBznc4s1yQamAr+CmG2xqg82Q="; + sha256 = "sha256-jAkiG7ctnbXInP17kZdxgyuGw6N3LWRWAWlklO31Zrk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/speechd/fix-paths.patch b/nixpkgs/pkgs/development/libraries/speechd/fix-paths.patch index acf7e5e08f4f..7509c1842ba8 100644 --- a/nixpkgs/pkgs/development/libraries/speechd/fix-paths.patch +++ b/nixpkgs/pkgs/development/libraries/speechd/fix-paths.patch @@ -1,9 +1,11 @@ +diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in +index ab14b99d..12521b1b 100644 --- a/speech-dispatcherd.service.in +++ b/speech-dispatcherd.service.in -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ Description=Speech-Dispatcher, common interface to speech synthesizers [Service] Type=forking - ExecStart=@bindir@/speech-dispatcher -d + ExecStart=@bindir@/speech-dispatcher -d -t 0 -ExecReload=/bin/kill -HUP $MAINPID +ExecReload=@utillinux@/bin/kill -HUP $MAINPID diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index 51adb59a9176..dc85ac20bf6a 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.243.0"; + version = "1.3.250.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-VOq3r6ZcbDGGxjqC4IoPMGC5n1APUPUAs9xcRzxdyfk="; + hash = "sha256-5mVcbOAuzux/Yuo0NMwZRTsdQr46UxjrtMhT5mPHyCQ="; }; nativeBuildInputs = [ cmake ]; - # https://github.com/KhronosGroup/SPIRV-Headers/issues/282 - postPatch = '' - substituteInPlace SPIRV-Headers.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = with lib; { description = "Machine-readable components of the Khronos SPIR-V Registry"; homepage = "https://github.com/KhronosGroup/SPIRV-Headers"; diff --git a/nixpkgs/pkgs/development/libraries/sregex/default.nix b/nixpkgs/pkgs/development/libraries/sregex/default.nix new file mode 100644 index 000000000000..48a1b9c3930e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sregex/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "sregex"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "openresty"; + repo = pname; + rev = "v${version}"; + hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg="; + }; + + makeFlags = [ "PREFIX=$(out)" "CC:=$(CC)" ]; + + meta = with lib; { + homepage = "https://github.com/openresty/sregex"; + description = "A non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams"; + license = licenses.bsd3; + maintainers = with maintainers; []; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix index 97e55a03033a..73bf5c25ae54 100644 --- a/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "srt"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "sha256-qVvoHtROtJjrUd+YpjN/0I6KmiH7c24+pQ4xYTUGPXk="; + sha256 = "sha256-HW5l26k9w4F6IJrtiahU/8/CPY6M/cKn8AgESsntC6A="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix index fee0cb42164e..4406aa021848 100644 --- a/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stb"; - version = "unstable-2021-09-10"; + version = "unstable-2023-01-29"; src = fetchFromGitHub { owner = "nothings"; repo = "stb"; - rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a"; - sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr"; + rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9"; + hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98="; }; nativeBuildInputs = [ copyPkgconfigItems ]; diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix index 6a88fae3737c..47a512b56a8c 100644 --- a/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.5.1"; + version = "6.6.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-QlIwOAUXHk290ZoB5Swdz+Da/FmcPP7bClwv+wRainU="; + hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix index 4d27e3a9582a..4abaced42ae2 100644 --- a/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -1,28 +1,25 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , gmp , flint , mpfr , libmpc -, catch +, withShared ? true }: stdenv.mkDerivation rec { pname = "symengine"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0="; + hash = "sha256-qTu0vS9K6rrr/0SXKpGC9P1QSN/AN7hyO/4DrGvhxWM="; }; - postPatch = '' - cp ${catch}/include/catch/catch.hpp symengine/utilities/catch/catch.hpp - ''; - nativeBuildInputs = [ cmake ]; buildInputs = [ gmp flint mpfr libmpc ]; @@ -36,14 +33,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not? "-DBUILD_TESTS=OFF" + ] ++ lib.optionals withShared [ + "-DBUILD_SHARED_LIBS=ON" ]; doCheck = true; - checkPhase = '' - ctest - ''; - meta = with lib; { description = "A fast symbolic manipulation library"; homepage = "https://github.com/symengine/symengine"; diff --git a/nixpkgs/pkgs/development/libraries/ta-lib/default.nix b/nixpkgs/pkgs/development/libraries/ta-lib/default.nix index b3900f645111..ea5ec66cf169 100644 --- a/nixpkgs/pkgs/development/libraries/ta-lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/ta-lib/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rafa-dot-el"; repo = "talib"; - rev = "${version}"; + rev = version; sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw="; }; diff --git a/nixpkgs/pkgs/development/libraries/tclap/default.nix b/nixpkgs/pkgs/development/libraries/tclap/1.2.nix index cdb2b5193291..cdb2b5193291 100644 --- a/nixpkgs/pkgs/development/libraries/tclap/default.nix +++ b/nixpkgs/pkgs/development/libraries/tclap/1.2.nix diff --git a/nixpkgs/pkgs/development/libraries/tclap/1.4.nix b/nixpkgs/pkgs/development/libraries/tclap/1.4.nix new file mode 100644 index 000000000000..7a0b57659633 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tclap/1.4.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchgit +, cmake +, doxygen +, python3 +}: +stdenv.mkDerivation { + pname = "tclap"; + + # This version is slightly newer than 1.4.0-rc1: + # See https://github.com/mirror/tclap/compare/1.4.0-rc1..3feeb7b2499b37d9cb80890cadaf7c905a9a50c6 + version = "1.4-3feeb7b"; + + src = fetchgit { + url = "git://git.code.sf.net/p/tclap/code"; + rev = "3feeb7b2499b37d9cb80890cadaf7c905a9a50c6"; # 1.4 branch + hash = "sha256-byLianB6Vf+I9ABMmsmuoGU2o5RO9c5sMckWW0F+GDM="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + nativeBuildInputs = [ + cmake + doxygen + python3 + ]; + + # Installing docs is broken in this package+version so we stub out some files + preInstall = '' + touch docs/manual.html + ''; + + doCheck = true; + + meta = with lib; { + description = "Templatized C++ Command Line Parser Library (v1.4)"; + homepage = "https://tclap.sourceforge.net/"; + license = licenses.mit; + maintainers = teams.deshaw.members; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix index 4a0c8a6cad08..c166d36d5a60 100644 --- a/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; }; nativeBuildInputs = [ @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postFixup = if stdenv.isDarwin + then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' + else null; + # python-config from build Python gives incorrect values when cross-compiling. # If python-config is not found, the build falls back to using the sysconfig # module, which works correctly in all cases. diff --git a/nixpkgs/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix index 387fa214de26..796810ade97a 100644 --- a/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; - maintainers = teams.gnome.members ++ [ maintainers.manveru ]; + maintainers = [ maintainers.manveru ]; license = licenses.lgpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index fd6b21a94f72..acb3a2404870 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.18.0"; + version = "0.18.1"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-fBk4nLeRCiDli45GkDyMGjY1MAj5/MGwP3SKzPm18+E="; + hash = "sha256-BMbxDl14jKeOE+4u8NIVLHsHDAr1VIPWuULinP8pZyY="; }; # Workaround to make the Python wrapper not drop this package: @@ -102,6 +102,9 @@ stdenv.mkDerivation rec { "SecurityFromBufferTest" "python_test" + # fails on hydra, passes locally + "concurrency_test" + # Tests that fail in the Darwin sandbox when trying to use network "UnitTests" "TInterruptTest" diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index ec17a2d515a0..9d7cb73cc539 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, fetchurl , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which -, shadow +, shadow, libuuid }: let # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.2.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "1jijxnvjcsgz5yw4i9fj7ycdnnz90r3l0zicpwinswrw47ac3yy5"; + sha256 = "sha256-75yiKVZrR1vcCwKp4tDO4A9JB0KDM0MXPJ1N85kAaRk="; }; outputs = [ "out" "man" "dev" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # cmocka is checked / used(?) in the configure script # when unit and/or integration testing is enabled - buildInputs = [ openssl json_c curl libgcrypt uthash ] + 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) [ @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { # Do not rely on dynamic loader path # TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory ./no-dynamic-loader-path.patch + (fetchurl { + name = "skip-test-fapi-fix-provisioning-with template-if-no-certificate-available.patch"; + url = "https://github.com/tpm2-software/tpm2-tss/commit/218c0da8d9f675766b1de502a52e23a3aa52648e.patch"; + sha256 = "sha256-dnl9ZAknCdmvix2TdQvF0fHoYeWp+jfCTg8Uc7h0voA="; + }) ]; postPatch = '' @@ -61,8 +66,8 @@ stdenv.mkDerivation rec { --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ --replace '@PREFIX@' $out/lib - substituteInPlace ./configure.ac \ - --replace 'm4_esyscmd_s([git describe --tags --always --dirty])' '${version}' + substituteInPlace ./bootstrap \ + --replace 'git describe --tags --always --dirty' 'echo "${version}"' ''; configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ @@ -91,6 +96,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-tss"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ baloo ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch index fc905885f506..60f8c91bae85 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch @@ -1,8 +1,17 @@ diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c -index b364695c..d026de71 100644 +index 622637dc..88fc3d8f 100644 --- a/src/tss2-tcti/tctildr-dl.c +++ b/src/tss2-tcti/tctildr-dl.c -@@ -116,6 +116,50 @@ handle_from_name(const char *file, +@@ -92,7 +92,7 @@ handle_from_name(const char *file, + LOG_DEBUG("Could not load TCTI file: \"%s\": %s", file, dlerror()); + } + +- len = snprintf(NULL, 0, TCTI_NAME_TEMPLATE_0, file); ++ len = snprintf(NULL, 0, "@PREFIX@" TCTI_NAME_TEMPLATE_0, file); + if (len >= PATH_MAX) { + LOG_ERROR("TCTI name truncated in transform."); + return TSS2_TCTI_RC_BAD_VALUE; +@@ -129,6 +129,50 @@ handle_from_name(const char *file, return TSS2_TCTI_RC_BAD_VALUE; } *handle = dlopen(file_xfrm, RTLD_NOW); @@ -12,10 +21,10 @@ index b364695c..d026de71 100644 + LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); + } + size = snprintf(file_xfrm, -+ sizeof (file_xfrm), ++ len + 1, + "@PREFIX@%s", + file); -+ if (size >= sizeof (file_xfrm)) { ++ if (size >= len + 1) { + LOG_ERROR("TCTI name truncated in transform."); + return TSS2_TCTI_RC_BAD_VALUE; + } @@ -27,10 +36,10 @@ index b364695c..d026de71 100644 + } + /* 'name' alone didn't work, try libtss2-tcti-<name>.so.0 */ + size = snprintf(file_xfrm, -+ sizeof (file_xfrm), ++ len + 1, + "@PREFIX@" TCTI_NAME_TEMPLATE_0, + file); -+ if (size >= sizeof (file_xfrm)) { ++ if (size >= len + 1) { + LOG_ERROR("TCTI name truncated in transform."); + return TSS2_TCTI_RC_BAD_VALUE; + } @@ -42,22 +51,22 @@ index b364695c..d026de71 100644 + } + /* libtss2-tcti-<name>.so.0 didn't work, try libtss2-tcti-<name>.so */ + size = snprintf(file_xfrm, -+ sizeof (file_xfrm), ++ len + 1, + "@PREFIX@" TCTI_NAME_TEMPLATE, + file); -+ if (size >= sizeof (file_xfrm)) { ++ if (size >= len + 1) { + LOG_ERROR("TCTI name truncated in transform."); + return TSS2_TCTI_RC_BAD_VALUE; + } + *handle = dlopen(file_xfrm, RTLD_NOW); if (*handle == NULL) { LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); - return TSS2_TCTI_RC_NOT_SUPPORTED; + SAFE_FREE(file_xfrm); diff --git a/test/unit/tctildr-dl.c b/test/unit/tctildr-dl.c -index 873a4531..c17b939e 100644 +index 4279baee..6685c811 100644 --- a/test/unit/tctildr-dl.c +++ b/test/unit/tctildr-dl.c -@@ -223,6 +223,18 @@ test_get_info_default_success (void **state) +@@ -229,6 +229,18 @@ test_get_info_default_success (void **state) expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -76,7 +85,7 @@ index 873a4531..c17b939e 100644 expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, HANDLE); -@@ -255,6 +267,18 @@ test_get_info_default_info_fail (void **state) +@@ -261,6 +273,18 @@ test_get_info_default_info_fail (void **state) expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -95,7 +104,7 @@ index 873a4531..c17b939e 100644 expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, HANDLE); -@@ -407,6 +431,15 @@ test_tcti_fail_all (void **state) +@@ -413,6 +437,15 @@ test_tcti_fail_all (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -111,7 +120,7 @@ index 873a4531..c17b939e 100644 /* Skip over libtss2-tcti-tabrmd.so */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); -@@ -418,6 +451,15 @@ test_tcti_fail_all (void **state) +@@ -424,6 +457,15 @@ test_tcti_fail_all (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -127,7 +136,7 @@ index 873a4531..c17b939e 100644 /* Skip over libtss2-tcti-device.so, /dev/tpmrm0 */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); -@@ -429,6 +471,15 @@ test_tcti_fail_all (void **state) +@@ -435,6 +477,15 @@ test_tcti_fail_all (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -143,7 +152,7 @@ index 873a4531..c17b939e 100644 /* Skip over libtss2-tcti-device.so, /dev/tpm0 */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); -@@ -440,6 +491,15 @@ test_tcti_fail_all (void **state) +@@ -446,6 +497,15 @@ test_tcti_fail_all (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -159,7 +168,7 @@ index 873a4531..c17b939e 100644 /* Skip over libtss2-tcti-swtpm.so */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-swtpm.so.0"); -@@ -451,6 +511,15 @@ test_tcti_fail_all (void **state) +@@ -457,6 +517,15 @@ test_tcti_fail_all (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -175,7 +184,7 @@ index 873a4531..c17b939e 100644 /* Skip over libtss2-tcti-mssim.so */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-mssim.so.0"); -@@ -462,6 +531,15 @@ test_tcti_fail_all (void **state) +@@ -468,6 +537,15 @@ test_tcti_fail_all (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-mssim.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -191,7 +200,7 @@ index 873a4531..c17b939e 100644 TSS2_RC r; TSS2_TCTI_CONTEXT *tcti; -@@ -490,6 +568,15 @@ test_info_from_name_handle_fail (void **state) +@@ -496,6 +574,15 @@ test_info_from_name_handle_fail (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); @@ -207,7 +216,7 @@ index 873a4531..c17b939e 100644 TSS2_RC rc = info_from_name ("foo", &info, &data); assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED); -@@ -606,6 +693,15 @@ test_tctildr_get_info_from_name (void **state) +@@ -612,6 +699,15 @@ test_tctildr_get_info_from_name (void **state) expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index 1df7553e6c69..ce54681799bc 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -4,6 +4,7 @@ , fetchpatch , gettext , meson +, mesonEmulatorHook , ninja , pkg-config , asciidoc @@ -32,13 +33,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.5.1"; + version = "3.5.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+XLVCse6/czxE7HrmdyuNUBGhameVb/vFvOsg7Tel00="; + sha256 = "FGbIsIl75dngVth+EK1YkntYgDPwGvLxplaokhw6KO4="; }; patches = [ @@ -71,6 +72,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withIntrospection [ gobject-introspection vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ucc/default.nix b/nixpkgs/pkgs/development/libraries/ucc/default.nix index 1e626911f28a..e26e6e603f8e 100644 --- a/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit , enableAvx ? stdenv.hostPlatform.avxSupport , enableSse41 ? stdenv.hostPlatform.sse4_1Support @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ucc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucc"; rev = "v${version}"; - sha256 = "sha256-5rf08SXy+vCfnz4zLJ0cMnxwso4WpZOt0jRRAUviVFU="; + sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix index 1af9a7ce7cb6..4ded9c2860aa 100644 --- a/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl , rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit , enableRocm ? false , rocm-core, rocm-runtime, rocm-device-libs, hip diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index b40f465546d9..cb1a8dccffd1 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -18,14 +18,14 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; version = "0.17.17"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; + url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; sha256 = "sha256-IOYhseRYsyADz+qZc5tngkuGZShUqLzjPiYSTjR/32w="; }; @@ -50,10 +50,13 @@ stdenv.mkDerivation rec { buildInputs = [ glib systemd - libgudev libpcap ]; + checkInputs = lib.optionals finalAttrs.passthru.withGudev [ + libgudev + ]; + nativeCheckInputs = [ python3 which @@ -81,12 +84,25 @@ stdenv.mkDerivation rec { ln -s "$PWD/libumockdev-preload.so.0" "$out/lib/libumockdev-preload.so.0" ''; + passthru = { + # libgudev is needed for an optional test but it itself relies on umockdev for testing. + withGudev = false; + + tests = { + withGudev = finalAttrs.finalPackage.overrideAttrs (attrs: { + passthru = attrs.passthru // { + withGudev = true; + }; + }); + }; + }; + meta = with lib; { homepage = "https://github.com/martinpitt/umockdev"; - changelog = "https://github.com/martinpitt/umockdev/releases/tag/${version}"; + changelog = "https://github.com/martinpitt/umockdev/releases/tag/${finalAttrs.version}"; description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/urdfdom/default.nix b/nixpkgs/pkgs/development/libraries/urdfdom/default.nix index 91424d7d6d95..6e59914044fc 100644 --- a/nixpkgs/pkgs/development/libraries/urdfdom/default.nix +++ b/nixpkgs/pkgs/development/libraries/urdfdom/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, validatePkgConfig -, tinyxml, boost, urdfdom-headers, console-bridge }: +, urdfdom-headers, console-bridge, tinyxml }: stdenv.mkDerivation rec { pname = "urdfdom"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "ros"; repo = pname; rev = version; - hash = "sha256-9MJnify4zcDBSZVJZCN/XupN5xax+U4PLee54gVVw3Q="; + hash = "sha256-UdkGJAXK3Q8QJaqMZBA5/FKUgWq9EVeqkqwVewTlTD8="; }; patches = [ @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config validatePkgConfig ]; - buildInputs = [ tinyxml boost ]; - propagatedBuildInputs = [ urdfdom-headers console-bridge ]; + propagatedBuildInputs = [ urdfdom-headers console-bridge tinyxml ]; meta = with lib; { description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index b2fcf8eb1ebb..684982e5364f 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "62"; + version = "63"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-/40+SXFLX8upGKP3K+wk8RnO1Al4YoF8GFXyoxTkKs0="; + sha256 = "sha256-6ITmzz1xJN/UnzVl0aAO8VNs0Go8zGcswwGpJUwwLB8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/vectorscan/default.nix b/nixpkgs/pkgs/development/libraries/vectorscan/default.nix index 20fe3c93b9f1..03aec03ad656 100644 --- a/nixpkgs/pkgs/development/libraries/vectorscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/vectorscan/default.nix @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ragel - util-linux python3 - ]; + ] ++ lib.optional stdenv.isLinux util-linux; buildInputs = [ boost diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 91bd1a634630..7206fc1bc530 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.249"; + version = "1.3.254"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "v${version}"; - hash = "sha256-PLqF9lO7vWvgRZvXLmOcNhTgkB+3TXUa0eoALwDc5Ws="; + hash = "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A="; }; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index d6af2ceabb28..a4cb0ae82330 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.249"; + version = "1.3.254"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "v${version}"; - hash = "sha256-v4GEZEcQP3+oiT66sgysIZ2PdLSidyYjecb3TmcHG2Y="; + hash = "sha256-bxmDhKDM+OOTsSJEoGXlWPZciBcwevv0e4gHweH46JU="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 429fae7feb36..dc53bbb54d2a 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.31"; + version = "1.32"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-oH+nIu2HZ27AINhncUvJovJMRk2nORLzlwbu71IZ4jg="; + hash = "sha256-dFl5nTQMgpa2le+FfAfd7yTFoJsJq2p097kmQNKxuhE="; }; postPatch = lib.optionalString doCheck '' diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 5407a74ee2ba..57168b2cc17a 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.2"; + version = "2.40.5"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-lomIcNmU2kBu56YygW3N6aO7OV7l80T8s/O4zIp34AA="; + hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index 9a95494558b8..f78d8b35e2a8 100644 --- a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , darwin -, abseil-cpp_202111 +, abseil-cpp , meson , ninja }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v1.0/webrtc-audio-processing-v${version}.tar.gz"; + url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v${version}/webrtc-audio-processing-v${version}.tar.gz"; sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - abseil-cpp_202111 + abseil-cpp ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/whereami/default.nix b/nixpkgs/pkgs/development/libraries/whereami/default.nix new file mode 100644 index 000000000000..26908d2b1084 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/whereami/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, fixDarwinDylibNames +}: +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in +stdenv.mkDerivation rec { + pname = "whereami"; + version = "unstable-2022-02-18"; + + src = fetchFromGitHub { + owner = "gpakosz"; + repo = pname; + rev = "ba364cd54fd431c76c045393b6522b4bff547f50"; + sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk="; + }; + + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + makeFlags = [ + "-C_gnu-make" + "build-library" + "binsubdir=platform" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib $out/include + cp bin/platform/library${libExt} $out/lib/libwhereami${libExt} + cp src/whereami.h $out/include/whereami.h + + runHook postInstall + ''; + + meta = with lib; { + description = "Locate the current executable and running module/library"; + homepage = "https://github.com/gpakosz/whereami"; + license = with licenses; [ mit wtfpl ]; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix index 8877365e1dd6..23dc8dc3b053 100644 --- a/nixpkgs/pkgs/development/libraries/wildmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, freepats }: +{ lib, stdenv, fetchFromGitHub, writeTextFile, cmake, alsa-lib, OpenAL, freepats }: +let + defaultCfgPath = "${placeholder "out"}/etc/wildmidi/wildmidi.cfg"; +in stdenv.mkDerivation rec { pname = "wildmidi"; version = "0.4.5"; @@ -13,21 +16,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ]; + buildInputs = lib.optionals stdenv.buildPlatform.isLinux [ + alsa-lib stdenv.cc.libc/*couldn't find libm*/ + ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ + OpenAL + ]; preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /etc/wildmidi $out/etc # https://github.com/Mindwerks/wildmidi/issues/236 substituteInPlace src/wildmidi.pc.in \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; - postInstall = '' - mkdir "$out"/etc - echo "dir ${freepats}" > "$out"/etc/wildmidi.cfg - echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg + cmakeFlags = [ + "-DWILDMIDI_CFG=${defaultCfgPath}" + ]; + + postInstall = let + defaultCfg = writeTextFile { + name = "wildmidi.cfg"; + text = '' + dir ${freepats} + source ${freepats}/freepats.cfg + ''; + }; + in '' + mkdir -p "$(dirname ${defaultCfgPath})" + ln -s ${defaultCfg} ${defaultCfgPath} ''; meta = with lib; { @@ -39,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 8e0ebab220af..726640293e34 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -28,15 +28,17 @@ let generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "wlroots"; inherit version; + inherit enableXWayland; + src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = version; + rev = finalAttrs.version; inherit hash; }; @@ -48,7 +50,7 @@ let strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ] + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ] ++ extraNativeBuildInputs; buildInputs = [ @@ -70,11 +72,11 @@ let xorg.xcbutilrenderutil xorg.xcbutilwm ] - ++ lib.optional enableXWayland xwayland + ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; mesonFlags = - lib.optional (!enableXWayland) "-Dxwayland=disabled" + lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" ; postFixup = '' @@ -98,33 +100,24 @@ let Pluggable, composable, unopinionated modules for building a Wayland compositor; or about 50,000 lines of code you were going to write anyway. ''; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ]; }; - }; + }); in rec { - wlroots_0_14 = generic { - version = "0.14.1"; - hash = "sha256-wauk7TCL/V7fxjOZY77KiPbfydIc9gmOiYFOuum4UOs="; - }; - wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; - extraBuildInputs = [ vulkan-loader ]; - extraNativeBuildInputs = [ glslang ]; }; wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; - extraBuildInputs = [ vulkan-loader ]; - extraNativeBuildInputs = [ glslang ]; extraPatch = '' substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ diff --git a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix index d2ff39d7d574..87234d208da3 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "wlr-protocols"; - version = "unstable-2021-11-01"; + version = "unstable-2022-09-05"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlr-protocols"; - rev = "d998ee6fc64ea7e066014023653d1271b7702c09"; - sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr"; + rev = "4264185db3b7e961e7f157e1cc4fd0ab75137568"; + sha256 = "Ztc07RLg+BZPondP/r6Jo3Fw1QY/z1QsFvdEuOqQshA="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/wt/default.nix b/nixpkgs/pkgs/development/libraries/wt/default.nix index 8b92e78d2bdf..c9adf68115bf 100644 --- a/nixpkgs/pkgs/development/libraries/wt/default.nix +++ b/nixpkgs/pkgs/development/libraries/wt/default.nix @@ -40,7 +40,7 @@ let description = "C++ library for developing web applications"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ juliendehos willibutz ]; + maintainers = with maintainers; [ juliendehos ]; }; }; in { diff --git a/nixpkgs/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix index b63b0101d54b..2fb4f995fe4c 100644 --- a/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -17,7 +17,7 @@ , custatsSupport ? false # Internal profiling of encoder work , debugSupport ? false # Run-time sanity checks (debugging) , ppaSupport ? false # PPA profiling instrumentation -, unittestsSupport ? (stdenv.is64bit && !(stdenv.isDarwin && stdenv.isAarch64)) # Unit tests - only testing x64 assembly +, unittestsSupport ? stdenv.isx86_64 # Unit tests - only testing x64 assembly , vtuneSupport ? false # Vtune profiling instrumentation , werrorSupport ? false # Warnings as errors }: diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 3c0a555dd978..c70b5e195708 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -54,5 +54,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.21" "sha256-gPhgNNL7VZAHlUgd+uaBv6oQ776BirrTYizcDFXgb4g="; + xapian_1_4 = generic "1.4.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg="; } diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index 65d4c520fbae..f5ae2ecfaa5a 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-iKETxVmPyVgz4SEscL5GOrudVgFWTSG4YWNvc3lVqtU="; + hash = "sha256-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index cc7406b11463..c88c7d42b128 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; + mainProgram = "xdg-dbus-proxy"; }; } diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 766f944f15a1..c25bc2f512ba 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NoLFRsgZIqW6adYthvacDCaxfJCWgj9YFJ0LVbvw7ts="; + sha256 = "UO0arCkDA+oLxchAqcEWWRhUarSnOiTFLcqicHK1/yE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 80d409c080cb..bb1569b3a258 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -4,32 +4,29 @@ , meson , ninja , pkg-config -, python3 , wrapGAppsHook , cinnamon , glib , gsettings-desktop-schemas -, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-oXV4u/w4MWhKHf5vNbUNcyEJpKVFWcyEs1HEqo6eCyU="; + hash = "sha256-sPpRDoQuzyjqB+kwz0U2WFm/Byx7SueM3aCtpgy38JM="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 wrapGAppsHook ]; @@ -37,7 +34,6 @@ stdenv.mkDerivation rec { cinnamon.cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location - gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; @@ -46,11 +42,6 @@ stdenv.mkDerivation rec { "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; - postPatch = '' - chmod +x data/meson_install_schemas.py - patchShebangs data/meson_install_schemas.py - ''; - meta = with lib; { description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce"; homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp"; diff --git a/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/nixpkgs/pkgs/development/libraries/xercesc/default.nix index c7509bc43ab5..0a254b109583 100644 --- a/nixpkgs/pkgs/development/libraries/xercesc/default.nix +++ b/nixpkgs/pkgs/development/libraries/xercesc/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ stdenv +, lib +, fetchurl +, curl +}: stdenv.mkDerivation rec { pname = "xerces-c"; @@ -9,8 +13,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as="; }; - # Disable SSE2 extensions on platforms for which they are not enabled by default - configureFlags = [ "--disable-sse2" ]; + buildInputs = [ + curl + ]; + + configureFlags = [ + # Disable SSE2 extensions on platforms for which they are not enabled by default + "--disable-sse2" + "--enable-netaccessor-curl" + ]; + enableParallelBuilding = true; meta = { diff --git a/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix b/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix new file mode 100644 index 000000000000..bde2dfefee74 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix @@ -0,0 +1,45 @@ +{ lib +, clangStdenv +, fetchFromGitHub +, cmake +, cppzmq +, libuuid +, nlohmann_json +, openssl +, xeus +, xtl +, zeromq +}: + +clangStdenv.mkDerivation rec { + pname = "xeus-zmq"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus-zmq"; + rev = "${version}"; + hash = "sha256-j23NPgqwjQ7x4QriCb+N7CtBWhph+pCmBC0AULEDL1U="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cppzmq + libuuid + openssl + xeus + xtl + zeromq + ]; + + propagatedBuildInputs = [ nlohmann_json ]; + + meta = { + description = "ZeroMQ-based middleware for xeus"; + homepage = "https://github.com/jupyter-xeus/xeus-zmq"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 2f0c7a1d7a4c..31d064c2af6d 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -5,7 +5,7 @@ , cmake , gtest , doCheck ? true -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , ncclSupport ? false , rLibrary ? false , cudaPackages @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-IBqtyz40VVHdncibnZQAe5oDsjb5isWBYQ6pGx/zt38="; + hash = "sha256-i7smd56rLbNY0qXysq818VYWYbjrnFbyIjQkIgf9aOs="; }; nativeBuildInputs = [ cmake ] diff --git a/nixpkgs/pkgs/development/libraries/xine-lib/default.nix b/nixpkgs/pkgs/development/libraries/xine-lib/default.nix deleted file mode 100644 index 837cc0d48b57..000000000000 --- a/nixpkgs/pkgs/development/libraries/xine-lib/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, aalib -, alsa-lib -, autoconf -, ffmpeg_4 -, flac -, libGL -, libGLU -, libcaca -, libcdio -, libmng -, libmpcdec -, libpulseaudio -, libtheora -, libv4l -, libvorbis -, ncurses -, perl -, pkg-config -, speex -, vcdimager -, xorg -, zlib -}: - -stdenv.mkDerivation rec { - pname = "xine-lib"; - version = "1.2.11"; - - src = fetchurl { - url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz"; - sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU="; - }; - - patches = [ - # Fix build with libcaca 0.99.beta20 ; remove for xine-lib 1.2.12 - (fetchpatch { - name = "xine-lib-libcaca-0.99.beta20-fix.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch"; - sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr"; - }) - ]; - - nativeBuildInputs = [ - autoconf - pkg-config - perl - ]; - buildInputs = [ - aalib - alsa-lib - ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5 - flac - libGL - libGLU - libcaca - libcdio - libmng - libmpcdec - libpulseaudio - libtheora - libv4l - libvorbis - ncurses - perl - speex - vcdimager - zlib - ] ++ (with xorg; [ - libX11 - libXext - libXinerama - libXv - libxcb - ]); - - enableParallelBuilding = true; - - NIX_LDFLAGS = "-lxcb-shm"; - - - meta = with lib; { - homepage = "https://xine.sourceforge.net/"; - description = "A high-performance, portable and reusable multimedia playback engine"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/yas/default.nix b/nixpkgs/pkgs/development/libraries/yas/default.nix new file mode 100644 index 000000000000..137693401eba --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/yas/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "yas"; + version = "7.1.0"; + + src = fetchFromGitHub { + owner = "niXman"; + repo = "yas"; + rev = version; + hash = "sha256-2+CpftWOEnntYBCc1IoR5eySbmhrMVunpUTZRdQ5I+A="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/include/yas + cp -r include/yas/* $out/include/yas + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/niXman/yas"; + description = "Yet Another Serialization"; + license = licenses.boost; + maintainers = with maintainers; [ ee2500 ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index b37dfbdd7077..53b1f2f7431a 100644 --- a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium -, enableDrafts ? false }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, asciidoc +, pkg-config +, libsodium +, enableDrafts ? false +}: stdenv.mkDerivation rec { pname = "zeromq"; @@ -12,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; }; + patches = [ + # Backport gcc-13 fix: + # https://github.com/zeromq/libzmq/pull/4480 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; + hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; + }) + ]; + nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; diff --git a/nixpkgs/pkgs/development/libraries/zimg/default.nix b/nixpkgs/pkgs/development/libraries/zimg/default.nix index 60a20bf8a5dc..dbd6c9582dd7 100644 --- a/nixpkgs/pkgs/development/libraries/zimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00"; + sha256 = "sha256-DCSqHCnOyIvKtIAfprb8tgtzLn67Ix6BWyeIliu0HO4="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix index 482aa11d0b1b..456ef7c7a1bf 100644 --- a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch +, cmake, pkg-config, gtest , withZlibCompat ? false }: stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.0.7"; + version = "2.1.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - sha256 = "sha256-Q+u71XXfHafmTL8tmk4XcgpbSdBIunveL9Q78LqiZF0="; + sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw="; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch"; + hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE="; + }) + ]; + outputs = [ "out" "dev" "bin" ]; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtest ]; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=/" "-DBUILD_SHARED_LIBS=ON" diff --git a/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix index c4c20f207a41..e90df0888a0d 100644 --- a/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; }) + # Fixes invalid pointer conversions that cause compilation to fail with clang 15+ + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/38e4d5f561318fa825e6544c2ef55ac5899c81b0.diff"; + sha256 = "sha256-VJuFyiPhuAZlDxmNHBty+JbYwG85ea5u2sv7HZRHMwo="; + }) ]; nativeBuildInputs = [ |