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

Merge pull request #7523 from cwoac/btsync

Browse Source 
wait for filesystem before starting btsync; bump to new package version
This commit is contained in:
Domen Kožar 2015-04-23 17:22:51 +02:00
commit a23b6cebfb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/networking/btsync.nix
View File

@ -293,7 +293,7 @@ in
systemd.services.btsync = with pkgs; { systemd.services.btsync = with pkgs; {
description = "Bittorrent Sync Service"; description = "Bittorrent Sync Service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" "local-fs.target" ];
serviceConfig = { serviceConfig = {
Restart = "on-abort"; Restart = "on-abort";
UMask = "0002"; UMask = "0002";
@ -305,7 +305,7 @@ in
systemd.services."btsync@" = with pkgs; { systemd.services."btsync@" = with pkgs; {
description = "Bittorrent Sync Service for %i"; description = "Bittorrent Sync Service for %i";
after = [ "network.target" ]; after = [ "network.target" "local-fs.target" ];
serviceConfig = { serviceConfig = {
Restart = "on-abort"; Restart = "on-abort";
User = "%i"; User = "%i";

8
pkgs/applications/networking/bittorrentsync/2.0.x.nix
View File

@ -5,18 +5,18 @@ let
else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "i686-linux" then "i386"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
sha256 = if stdenv.system == "x86_64-linux" then "cbce76f73f47c23d9073644504fa454976629450d008354bd8faef1bddf368fd" sha256 = if stdenv.system == "x86_64-linux" then "9e1427b7a6c6e960a378b97ac458ad53c445457ed0e5c8bf693f446597377b78"
else if stdenv.system == "i686-linux" then "d3e8583c8a54cbeb34ea3621daf0498316a959d944b30f24aa4e518a851ecdeb" else if stdenv.system == "i686-linux" then "4d446255ff6332da9a244737d6c20e7dcd32d24a8eaabffbaf73147e5898ed8f"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "btsync-${version}"; name = "btsync-${version}";
version = "2.0.93"; version = "2.0.105";
src = fetchurl { src = fetchurl {
url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"; url = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
inherit sha256; inherit sha256;
}; };