pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #307837 from barbosaaob/master

nextcloud-client: 3.12.3 -> 3.13.0

authored by Ilan Joselevich and committed by GitHub 2b05adee aa08ca6a

+6 -5
unified split
+4 -3
pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
··· 8 1 file changed, 1 insertion(+), 1 deletion(-) 9 10 diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt 11 - index 2e7349ef7..512d4b188 100644 12 --- a/shell_integration/libcloudproviders/CMakeLists.txt 13 +++ b/shell_integration/libcloudproviders/CMakeLists.txt 14 - @@ -1,5 +1,6 @@ 15 - macro(dbus_add_activation_service _sources) 16 pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) 17 + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") 18 foreach (_i ${_sources}) 19 get_filename_component(_service_file ${_i} ABSOLUTE)
··· 8 1 file changed, 1 insertion(+), 1 deletion(-) 9 10 diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt 11 + index b4434d0..b57e033 100644 12 --- a/shell_integration/libcloudproviders/CMakeLists.txt 13 +++ b/shell_integration/libcloudproviders/CMakeLists.txt 14 + @@ -4,6 +4,7 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0") 15 + else() 16 pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) 17 + endif() 18 + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") 19 foreach (_i ${_sources}) 20 get_filename_component(_service_file ${_i} ABSOLUTE)
+2 -2
pkgs/applications/networking/nextcloud-client/default.nix
··· 26 27 stdenv.mkDerivation rec { 28 pname = "nextcloud-client"; 29 - version = "3.12.3"; 30 31 outputs = [ "out" "dev" ]; 32 ··· 34 owner = "nextcloud"; 35 repo = "desktop"; 36 rev = "v${version}"; 37 - hash = "sha256-ScWkEOx2tHoCQbFwBvJQgk2YoYOTPi3PrVsaDNJBEUI="; 38 }; 39 40 patches = [
··· 26 27 stdenv.mkDerivation rec { 28 pname = "nextcloud-client"; 29 + version = "3.13.0"; 30 31 outputs = [ "out" "dev" ]; 32 ··· 34 owner = "nextcloud"; 35 repo = "desktop"; 36 rev = "v${version}"; 37 + hash = "sha256-i4vQGH9NSxIrLaPdCEh+WN6i6NQilH6uO4dSk/mhLi8="; 38 }; 39 40 patches = [