alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #59078 from dtzWill/fix-and-update/nextcloud

Browse source 
nextcloud: fix use of mismatched php versions, updates
This commit is contained in:
Robin Gloster 2019-04-07 09:55:39 +00:00 committed by GitHub
parent f370671c9a e2dbb35cb1
commit 0498ba6e06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -32,7 +32,7 @@ let
cd ${pkgs.nextcloud} cd ${pkgs.nextcloud}
exec /run/wrappers/bin/sudo -u nextcloud \ exec /run/wrappers/bin/sudo -u nextcloud \
NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \ NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \
${config.services.phpfpm.phpPackage}/bin/php \ ${phpPackage}/bin/php \
-c ${pkgs.writeText "php.ini" phpOptionsStr}\ -c ${pkgs.writeText "php.ini" phpOptionsStr}\
occ $* occ $*
''; '';
@ -360,7 +360,7 @@ in {
environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.User = "nextcloud"; serviceConfig.User = "nextcloud";
serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php";
}; };
}; };

21
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -1,35 +1,22 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch , inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch
, libcloudproviders
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nextcloud-client-${version}"; name = "nextcloud-client-${version}";
version = "2.5.1"; version = "2.5.2";
src = fetchgit { src = fetchgit {
url = "git://github.com/nextcloud/desktop.git"; url = "git://github.com/nextcloud/desktop.git";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d"; sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr";
fetchSubmodules = true; fetchSubmodules = true;
}; };
# Patches contained in next (>2.5.1) release
patches = [
(fetchpatch {
name = "fix-qt-5.12-build";
url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch";
sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n";
})
(fetchpatch {
name = "fix-qtwebengine-crash";
url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch";
sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0";
})
];
nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/servers/nextcloud/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nextcloud-${version}"; name = "nextcloud-${version}";
version = "15.0.5"; version = "15.0.6";
src = fetchurl { src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
sha256 = "125ra0rdgk17d8s80i54w0s58dqvjgkdpcxbczchqd3sg6dqcqa6"; sha256 = "1k1c0wlrhdpkvwf7iq8yjxd8gqmmj7dyd913rqzrg9jbnvz5jc82";
}; };
installPhase = '' installPhase = ''