public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43106 from dotlambda/seafile-client-6.2.1

Browse Source 
seafile-client: 6.1.8 -> 6.2.1
This commit is contained in:
Robert Schütz 2018-07-06 17:47:08 +02:00 committed by GitHub
commit a49ac62722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/seafile-client/default.nix
View File

@ -5,14 +5,14 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.1.8"; version = "6.2.1";
name = "seafile-client-${version}"; name = "seafile-client-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seafile-client"; repo = "seafile-client";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gy7jfxr5f8qvbqj80g7fzaw9b3vax750c4z5cr7f43rv99284pc"; sha256 = "02nzihs720pmgr5139s7fz88f7gm19dn1x2kqdpi81k7gdwqq0bp";
}; };
nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

23
pkgs/development/libraries/libsearpc/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: {stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
stdenv.mkDerivation rec stdenv.mkDerivation rec {
{ version = "3.0.8";
version = "3.0.7";
seafileVersion = "6.1.0";
name = "libsearpc-${version}"; name = "libsearpc-${version}";
src = fetchurl src = fetchFromGitHub {
{ owner = "haiwen";
url = "https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"; repo = "libsearpc";
sha256 = "0fdrgksdwd4qxp7qvh75y39dy52h2f5wfjbqr00h3rwkbx4npvpg"; # Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9
rev = "12a01268825e9c7e17794c58c367e3b4db912ad9";
sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0";
}; };
patches = [ ./libsearpc.pc.patch ]; patches = [ ./libsearpc.pc.patch ];
@ -18,12 +18,13 @@ stdenv.mkDerivation rec
buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ];
propagatedBuildInputs = [ glib jansson ]; propagatedBuildInputs = [ glib jansson ];
postPatch = "patchShebangs autogen.sh";
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
buildPhase = "make -j1"; buildPhase = "make -j1";
meta = meta = {
{
homepage = https://github.com/haiwen/libsearpc; homepage = https://github.com/haiwen/libsearpc;
description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
license = stdenv.lib.licenses.lgpl3; license = stdenv.lib.licenses.lgpl3;

19
pkgs/misc/seafile-shared/default.nix
View File

@ -1,12 +1,14 @@
{stdenv, fetchurl, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.1.0"; version = "6.2.1";
name = "seafile-shared-${version}"; name = "seafile-shared-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; owner = "haiwen";
sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; repo = "seafile";
rev = "v${version}";
sha256 = "199ivh6fbz4sgbz15mr6m8985yky5n3z6vpcpnh2ldjx4277gq68";
}; };
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
@ -18,13 +20,6 @@ stdenv.mkDerivation rec {
"--disable-console" "--disable-console"
]; ];
postInstall = ''
# Remove seafile binary
rm -rf "$out/bin/seafile"
# Remove cli client binary
rm -rf "$out/bin/seaf-cli"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/haiwen/seafile; homepage = https://github.com/haiwen/seafile;
description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";