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: d0d099266efa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1a66f6e03e4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 21, 2019

  1. owncloud-client: 2.4.3 -> 2.5.3.11470

    @das-g
    das-g committed Feb 21, 2019

    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
    22c7c4b View commit details

  2. Merge pull request #56114 from das-g/owncloud-client-2.5.3 

    owncloud-client: 2.4.3 -> 2.5.3.11470
    @ryantm
    ryantm authored Feb 21, 2019
    Copy the full SHA
    d1a66f6 View commit details
Showing with 2 additions and 16 deletions.
  1. +2 −4 pkgs/applications/networking/owncloud-client/default.nix
  2. +0 −12 pkgs/applications/networking/owncloud-client/find-sql.patch
6 changes: 2 additions & 4 deletions pkgs/applications/networking/owncloud-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,13 @@

stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
version = "2.4.3";
version = "2.5.3.11470";

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

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

nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];

12 changes: 0 additions & 12 deletions pkgs/applications/networking/owncloud-client/find-sql.patch
View file

This file was deleted.