From a498b28322d8d3f123522505d0443fff33503d9f Mon Sep 17 00:00:00 2001 From: Oliver Matthews Date: Thu, 23 Apr 2015 12:52:54 +0000 Subject: [PATCH] wait for filesystem before starting btsync; bump to latest package version --- nixos/modules/services/networking/btsync.nix | 4 ++-- pkgs/applications/networking/bittorrentsync/2.0.x.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 8b90f295ed46..d0123b79e3f8 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -293,7 +293,7 @@ in systemd.services.btsync = with pkgs; { description = "Bittorrent Sync Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" "local-fs.target" ]; serviceConfig = { Restart = "on-abort"; UMask = "0002"; @@ -305,7 +305,7 @@ in systemd.services."btsync@" = with pkgs; { description = "Bittorrent Sync Service for %i"; - after = [ "network.target" ]; + after = [ "network.target" "local-fs.target" ]; serviceConfig = { Restart = "on-abort"; User = "%i"; diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix index 9a7c07c322ed..83b6151e4f79 100644 --- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix +++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix @@ -5,18 +5,18 @@ let else if stdenv.system == "i686-linux" then "i386" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "cbce76f73f47c23d9073644504fa454976629450d008354bd8faef1bddf368fd" - else if stdenv.system == "i686-linux" then "d3e8583c8a54cbeb34ea3621daf0498316a959d944b30f24aa4e518a851ecdeb" + sha256 = if stdenv.system == "x86_64-linux" then "9e1427b7a6c6e960a378b97ac458ad53c445457ed0e5c8bf693f446597377b78" + else if stdenv.system == "i686-linux" then "4d446255ff6332da9a244737d6c20e7dcd32d24a8eaabffbaf73147e5898ed8f" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "btsync-${version}"; - version = "2.0.93"; + version = "2.0.105"; 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; };