Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1acb5ce6d84
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d166c694188
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 29, 2018

  1. seafile-shared: 6.2.5 -> 6.2.7 

    (cherry picked from commit 3dccf7d)

reason: built-error of seafile-shared-6.2.4 (see #51238)
    @schmittlauch
    Robert Schütz authored and schmittlauch committed Nov 29, 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
    2d3cf40 View commit details

  2. seafile-client: 6.2.5 -> 6.2.7 

    (cherry picked from commit 377e0e9)

reason: built-error of seafile-shared-6.2.4 (see #51238)
    @schmittlauch
    Robert Schütz authored and schmittlauch committed Nov 29, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    travi Matt Travi
    GPG key ID: 8C173646C24FED70
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f135007 View commit details

Commits on Nov 30, 2018

  1. Merge pull request #51257 from schmittlauch/seafile-backport 

    seafile-shared: backport newer minor version to fix build failures
    @dotlambda
    dotlambda authored Nov 30, 2018
    Copy the full SHA
    7d166c6 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/networking/seafile-client/default.nix
  2. +2 −2 pkgs/misc/seafile-shared/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/seafile-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "6.2.4";
version = "6.2.7";
name = "seafile-client-${version}";

src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "0z5li1d7ipsm1mp0lk6mls220v4vlmsqm8ym8kxlkinqbmkky0hz";
sha256 = "16ikl6vkp9v16608bq2sfg48idn2p7ik3q8n6j866zxkmgdvkpsg";
};

nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/misc/seafile-shared/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:

stdenv.mkDerivation rec {
version = "6.2.4";
version = "6.2.7";
name = "seafile-shared-${version}";

src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr";
sha256 = "0f8h7x6q830q4pw6f6bbykiyj3lkdlgvjzg2sdaqm4bhj2c4k1n0";
};

nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];