diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-19 06:01:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-19 06:01:17 +0000 |
commit | 1f30be411f2f3e3aa7cc614eea659dcdeaad1d7e (patch) | |
tree | 46cd2e7ca3411c570a6c7fe4743f52b54a05eafc | |
parent | 5374345f821041149ae72cecf38f42ac7ce2d51f (diff) | |
parent | a05c5b004c90254fac6ca28d9e326991b4f9680a (diff) |
Merge staging-next into staging
39 files changed, 264 insertions, 210 deletions
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index ebf3341e309a..1d930612e9f9 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -11,6 +11,7 @@ , minizip-ng , mkDerivation , qtgraphicaleffects +, qtmultimedia , qtquickcontrols2 , qttools }: @@ -33,7 +34,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "5.0.16"; + version = "5.1.2"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,13 +42,14 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-zS0JyK+HGiHY7tPdl3RK6fJJOUS+fKM1u3npNxDAAYE="; + hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc="; }; patches = [ ./do-not-build-linphone-sdk.patch ./remove-bc_compute_full_version-usage.patch ./no-store-path-in-autostart.patch + ./reset-output-dirs.patch ]; # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 @@ -55,6 +57,8 @@ mkDerivation rec { echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ --replace "APPLICATION_SEMVER" "\"${version}\"" + substituteInPlace CMakeLists.txt \ + --subst-var out ''; # TODO: After linphone-desktop and liblinphone split into separate packages, @@ -72,6 +76,7 @@ mkDerivation rec { minizip-ng qtgraphicaleffects + qtmultimedia qtquickcontrols2 ]; @@ -86,23 +91,20 @@ mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Requires EQt5Keychain + "-DENABLE_QT_KEYCHAIN=OFF" + + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; - # The default install phase fails because the paths are somehow messed up in - # the makefiles. The errors were like: - # - # CMake Error at cmake_builder/linphone_package/cmake_install.cmake:49 (file): - # file INSTALL cannot find - # "/build/linphone-desktop-.../build/linphone-sdk/desktop//nix/store/.../bin": - # No such file or directory. - # - # If someone is able to figure out how to fix that, great. For now, just - # trying to pick all the relevant files to the output. - # - # Also, the exec path in linphone.desktop file remains invalid, pointing to - # the build directory, after the whole nix build process. So, let's use sed to - # manually fix that path. - # + preInstall = '' + mkdir -p $out/share/linphone + mkdir -p $out/share/sounds/linphone + ''; + # In order to find mediastreamer plugins, mediastreamer package was patched to # support an environment variable pointing to the plugin directory. Set that # environment variable by wrapping the Linphone executable. @@ -116,26 +118,17 @@ mkDerivation rec { # It is quite likely that there are some other files still missing and # Linphone will randomly crash when it tries to access those files. Then, # those just need to be copied manually below. - installPhase = '' - mkdir -p $out/bin $out/lib - cp linphone-app/linphone $out/bin/ - cp linphone-app/libapp-plugin.so $out/lib/ + postInstall = '' mkdir -p $out/lib/mediastreamer/plugins ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ - wrapProgram $out/bin/linphone \ - --set MEDIASTREAMER_PLUGINS_DIR \ - $out/lib/mediastreamer/plugins - mkdir -p $out/share/applications - cp linphone-app/linphone.desktop $out/share/applications/ - mkdir -p $out/share/icons/hicolor/scalable/apps - cp ../linphone-app/assets/images/linphone_logo.svg $out/share/icons/hicolor/scalable/apps/linphone.svg + mkdir -p $out/share/belr/grammars ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/ - mkdir -p $out/share/linphone - ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ - ln -s ${liblinphone}/share/sounds $out/share/sounds + + wrapProgram $out/bin/linphone \ + --set MEDIASTREAMER_PLUGINS_DIR $out/lib/mediastreamer/plugins ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch index dc635b32a031..f93f031bf690 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch +++ b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch @@ -4,58 +4,72 @@ Date: Fri, 28 Jan 2022 02:36:01 +0100 Subject: [PATCH] Remove Linphone SDK build --- - CMakeLists.txt | 86 ++----------------- - .../cmake_builder/additional_steps.cmake | 9 -- - 2 files changed, 5 insertions(+), 90 deletions(-) + CMakeLists.txt | 100 +----------------- + .../cmake_builder/additional_steps.cmake | 9 -- + 2 files changed, 5 insertions(+), 104 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2002b925..6d92a8e5 100644 +index b5a4ab5..3afcd88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") - list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +@@ -194,7 +194,6 @@ list(APPEND APP_OPTIONS "-DQTKEYCHAIN_TARGET_NAME=${QTKEYCHAIN_TARGET_NAME}") + list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video -include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -190,30 +189,8 @@ if(ENABLE_BUILD_APP_PLUGINS) +@@ -237,41 +236,8 @@ if(ENABLE_BUILD_APP_PLUGINS) endif() endif() -- -if(NOT LINPHONE_QT_ONLY) --ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" -- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" -- STAMP_DIR "${SDK_BUILD_DIR}/stamp" -- BINARY_DIR "${SDK_BUILD_DIR}" -- STEP_TARGETS build -- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- BUILD_ALWAYS NO #${DO_BUILD} --) --ExternalProject_Add_Step(sdk force_build -- COMMENT "Forcing build for 'desktop'" -- DEPENDEES configure -- DEPENDERS build -- ALWAYS 1 --) +-#add_subdirectory(external/qtkeychain) +- if(ENABLE_QT_KEYCHAIN) +- ExternalProject_Add(app-qtkeychain PREFIX "${CMAKE_BINARY_DIR}/qtkeychain" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/qtkeychain" +- INSTALL_DIR "${QTKEYCHAIN_OUTPUT_DIR}" +- BINARY_DIR "${SDK_BUILD_DIR}/qtkeychain" +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${QTKEYCHAIN_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} +- BUILD_ALWAYS NO #${DO_BUILD} +- ) +- endif() +- ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} +- BUILD_ALWAYS NO #${DO_BUILD} +- ) +- ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'sdk'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +- ) -endif() include(FindPkgConfig) --set(APP_DEPENDS sdk) - find_package(Qt5 5.10 COMPONENTS Core REQUIRED) - - if ( NOT Qt5_FOUND ) -@@ -227,62 +204,9 @@ find_package(belcard CONFIG QUIET) - find_package(Mediastreamer2 CONFIG QUIET) +-set(APP_DEPENDS sdk)# Used if NOT LINPHONE_QT_ONLY + if(ENABLE_QT_KEYCHAIN) + list(APPEND APP_DEPENDS app-qtkeychain) + endif() +@@ -289,65 +255,9 @@ find_package(Mediastreamer2 CONFIG QUIET) find_package(ortp CONFIG QUIET) + find_package(${QTKEYCHAIN_TARGET_NAME} CONFIG QUIET) --if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) +-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) +- OR ( ENABLE_QT_KEYCHAIN AND NOT(${QTKEYCHAIN_TARGET_NAME}_FOUND) ) +- OR FORCE_APP_EXTERNAL_PROJECTS +-) - message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") - ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" @@ -65,7 +79,7 @@ index 2002b925..6d92a8e5 100644 - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} - # ${APP_OPTIONS} - BUILD_ALWAYS ON - ) @@ -78,10 +92,10 @@ index 2002b925..6d92a8e5 100644 - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} - ) - endif() -- install(CODE "message(STATUS Running install)") +- install(CODE "message(STATUS \"Running install\")") - set(AUTO_REGENERATION auto_regeneration) - if( ENABLE_BUILD_APP_PLUGINS) - add_custom_target(${AUTO_REGENERATION} ALL @@ -115,12 +129,12 @@ index 2002b925..6d92a8e5 100644 - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} - EXCLUDE_FROM_ALL ON - #BUILD_ALWAYS ON -) diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake -index 7f7fd573..a69a04e8 100644 +index 7f7fd57..a69a04e 100644 --- a/linphone-app/cmake_builder/additional_steps.cmake +++ b/linphone-app/cmake_builder/additional_steps.cmake @@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) @@ -139,5 +153,5 @@ index 7f7fd573..a69a04e8 100644 endif () endif () -- -2.25.1 +2.39.3 (Apple Git-145) diff --git a/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch b/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch new file mode 100644 index 000000000000..2ad43fb17e28 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5a4ab5..b6b89c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,10 +59,10 @@ set(CMAKE_CXX_STANDARD 11) + + # Prepare gobal CMAKE configuration specific to the current project + set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. +-set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +-set(QTKEYCHAIN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/qtkeychain") ++set(LINPHONE_OUTPUT_DIR "@out@") ++set(QTKEYCHAIN_OUTPUT_DIR "@out@") + set(QTKEYCHAIN_TARGET_NAME "EQt5Keychain") +-set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") ++set(APPLICATION_OUTPUT_DIR "@out@") + + set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}/include${PREFIX_PATH}") + if(WIN32) diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 2f362a4942c9..7b3a2ec37177 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle, git, perl -, makeWrapper, fetchpatch, substituteAll, jre_minimal +{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, +gradle, git, perl, makeWrapper, fetchpatch, substituteAll, jre_minimal }: # NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` @@ -114,7 +114,7 @@ in stdenv.mkDerivation { mkdir -p $out tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ wrapProgram $out/bin/signald \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils gnused ]} \ --set JAVA_HOME "${jre'}" runHook postInstall diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fee8325bf6d5..a19e996064a0 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V materus ]; + maintainers = with maintainers; [ jb55 MP2E materus ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix index e309447d9527..360b3fb349f6 100644 --- a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; homepage = "https://hg.sr.ht/~scoopta/wlrobs"; - maintainers = with maintainers; [ grahamc V ]; + maintainers = with maintainers; [ grahamc ]; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index c407d36d90f4..fe3831a27cdf 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "plain" @@ -57,9 +57,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix new file mode 100644 index 000000000000..2ed5129a6d13 --- /dev/null +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "livekit-cli"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "livekit"; + repo = "livekit-cli"; + rev = "v${version}"; + hash = "sha256-pzVzfs0bwG9n7fa0ouQiCFrbXAqkfovEIjVmrHFdqtI="; + }; + + vendorHash = "sha256-pM5DeaukY6x4RDryLvSEQASSwtOaLiiLObjhdWBYd8k="; + + subPackages = [ "cmd/livekit-cli" ]; + + meta = with lib; { + description = "Command line interface to LiveKit"; + homepage = "https://livekit.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ mgdelacroix ]; + mainProgram = "livekit-cli"; + }; +} diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix new file mode 100644 index 000000000000..54cdfbcf25f8 --- /dev/null +++ b/pkgs/by-name/li/livekit/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "livekit"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "livekit"; + repo = "livekit"; + rev = "v${version}"; + hash = "sha256-3KRES/2mGO6b1ZZEGx29Yu5wgEG4NOJ7/J0xPvQiNWk="; + }; + + vendorHash = "sha256-5wByIkMs3321u4/2vPpsZ/L5zlcgrZo0b+NjeMR1RWE="; + + subPackages = [ "cmd/server" ]; + + postInstall = '' + mv $out/bin/server $out/bin/livekit-server + ''; + + meta = with lib; { + description = "End-to-end stack for WebRTC. SFU media server and SDKs"; + homepage = "https://livekit.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ mgdelacroix ]; + mainProgram = "livekit-server"; + }; +} diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4c3740e4ba7c..ff40c3693fff 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/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.9.0"; + version = "9.10.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Tmn99wDkRoA+pnOjeCzHoCeR3P3MwCA1kqY6SZpkqw="; + sha256 = "sha256-SYk3aseaVD31rnGKj/7eoLldGbOdJfKMw4tVDjtjcwY="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 49357dc02bbe..f1c109b244b3 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.2.109"; + version = "5.2.111"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs="; + hash = "sha256-Le52tsyzOpepmvb+GOGCPwwTriPUjhYpa6GM+y/6USA="; }; patches = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 0b4526e6e1eb..3fae85187deb 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - hash = "sha256-YhUwRbpmEybezvopbqFj7M1EE3pufkNrN8yi/zbnJ3U="; + hash = "sha256-n1zj1U26l30JYr5Tio5zwv8v/e2cjEeIRGsyncMtt9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index fdbdb4db24bf..9dafb64e9292 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -20,6 +20,8 @@ , gpsd , ffmpeg , limesuite +, pkg-config +, zeromq , version , src , withFirmware ? false @@ -35,12 +37,12 @@ stdenv.mkDerivation rec { inherit version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw - limesuite + limesuite zeromq ] ++ lib.optionals withFirmware [ firmware ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 102a8b901cce..1eedfd3fea0b 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { "-DCONF_DIR=etc" "-DBUILD_LIBS=1" "-DWITH_PENTAX=off" + "-DWITH_AHP_XC=off" ]; postPatch = '' diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 6b110a152ee3..e2018ce7c2b0 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -6,7 |