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

Commits on Dec 10, 2020

  1. seafile-shared,seafile-client: 7.0.9 -> 7.0.10

    @eduardosm
    eduardosm committed Dec 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4f2a06b View commit details

Commits on Jan 2, 2021

  1. Merge pull request #106577 from eduardosm/seafile 

    seafile-shared,seafile-client: 7.0.9 -> 7.0.10
    @markuskowa
    markuskowa authored Jan 2, 2021

    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
    3f6e9fa View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/applications/networking/seafile-client/default.nix
  2. +3 −3 pkgs/misc/seafile-shared/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/networking/seafile-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet, jansson, libsearpc
, seafile-shared, jansson, libsearpc
, withShibboleth ? true, qtwebengine }:

mkDerivation rec {
pname = "seafile-client";
version = "7.0.9";
version = "7.0.10";

src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9";
sha256 = "082v1qbysrqb7m0lk56fpx8n403fjxbvbj0svm4mkjl6mzs2cv22";
};

nativeBuildInputs = [ pkgconfig cmake ];
@@ -21,7 +21,7 @@ mkDerivation rec {
++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";

qtWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}"
"--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}"
];

meta = with lib; {
6 changes: 3 additions & 3 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, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, ccnet, libuuid }:
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, libuuid }:

stdenv.mkDerivation rec {
pname = "seafile-shared";
version = "7.0.9";
version = "7.0.10";

src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk";
sha256 = "0b3297cbagi9x8dnw2gjifmb8dk6vyhg6vfrfsanm1wyx8pgw2jg";
};

nativeBuildInputs = [