Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c85d0beca537
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96c2cad2ddd6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 26, 2018

  1. owncloud-client: 2.3.4 -> 2.4.1

    @bfortz
    bfortz committed Apr 26, 2018
    Copy the full SHA
    882ed25 View commit details

Commits on May 9, 2018

  1. Merge pull request #39566 from bfortz/owncloud-2.4.1 

    owncloud-client: 2.3.4 -> 2.4.1
    @xeji
    xeji authored May 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    96c2cad View commit details
Showing with 15 additions and 3 deletions.
  1. +3 −3 pkgs/applications/networking/owncloud-client/default.nix
  2. +12 −0 pkgs/applications/networking/owncloud-client/find-sql.patch
6 changes: 3 additions & 3 deletions pkgs/applications/networking/owncloud-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
version = "2.3.4";
version = "2.4.1";

src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49";
sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23";
};

patches = [ ../nextcloud-client/find-sql.patch ];
patches = [ ./find-sql.patch ];

nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
12 changes: 12 additions & 0 deletions pkgs/applications/networking/owncloud-client/find-sql.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
*** a/cmake/modules/QtVersionAbstraction.cmake
--- b/cmake/modules/QtVersionAbstraction.cmake
***************
*** 8,13 ****
--- 8,14 ----
find_package(Qt5Core REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5Xml REQUIRED)
+ find_package(Qt5Sql REQUIRED)
find_package(Qt5Concurrent REQUIRED)
if(UNIT_TESTING)
find_package(Qt5Test REQUIRED)