summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniël de Kok <me@danieldk.eu>2019-06-03 07:47:54 +0200
committerDaniël de Kok <me@danieldk.eu>2019-06-03 09:16:13 +0200
commit3093e35f8ff8be2d7ff508af6430dfce62f1151a (patch)
tree217b9a5ca36b9246df1b590eb0457df7175343d6
parentc619bbbbef3a1a80171029314bf5c621386e4ed8 (diff)
downloadnixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.tar
nixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.tar.gz
nixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.tar.bz2
nixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.tar.lz
nixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.tar.xz
nixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.tar.zst
nixpkgs-3093e35f8ff8be2d7ff508af6430dfce62f1151a.zip
bittorrentSync: remove
-rw-r--r--pkgs/applications/networking/bittorrentsync/1.4.x.nix9
-rw-r--r--pkgs/applications/networking/bittorrentsync/2.0.x.nix9
-rw-r--r--pkgs/applications/networking/bittorrentsync/generic.nix41
-rw-r--r--pkgs/top-level/aliases.nix3
-rw-r--r--pkgs/top-level/all-packages.nix4
5 files changed, 3 insertions, 63 deletions
diff --git a/pkgs/applications/networking/bittorrentsync/1.4.x.nix b/pkgs/applications/networking/bittorrentsync/1.4.x.nix
deleted file mode 100644
index 9d57cdaaf20..00000000000
--- a/pkgs/applications/networking/bittorrentsync/1.4.x.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // {
-  version = "1.4.111";
-  sha256s = {
-    "x86_64-linux" = "0bw3ds3ndcnkry5mpv645z2bfi5z387bh0f7b35blxq1yv93r83f";
-    "i686-linux"   = "1qwaj7l7nsd4afx7ksb4b1c22mki9qa40803v9x1a8bhbdfhkczk";
-  };
-})
diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
deleted file mode 100644
index d2db3eec26e..00000000000
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // {
-  version = "2.3.8";
-  sha256s = {
-    "x86_64-linux" = "02n5s561cz3mprg682mrbmh3qai42dh64jgi05rqy9s6wgbn66ly";
-    "i686-linux"   = "118qrnxc7gvm30rsz0xfx6dlxmrr0dk5ajrvszhy06ww7xvqhzji";
-  };
-})
diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix
deleted file mode 100644
index 1075aea8db3..00000000000
--- a/pkgs/applications/networking/bittorrentsync/generic.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, version, sha256s, ... }:
-
-let
-  arch = {
-    "x86_64-linux" = "x64";
-    "i686-linux" = "i386";
-  }.${stdenv.hostPlatform.system} or throwSystem;
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
-in
-
-stdenv.mkDerivation rec {
-  name = "btsync-${version}";
-  inherit version;
-
-  src = fetchurl {
-    # annoyingly, downloads for 1.4 and 2.3 do not follow the same URL layout; this is
-    # a simple work-around, in place of overriding the url in the caller.
-    urls = [
-      "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz"
-      "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"
-    ];
-    sha256 = sha256s.${stdenv.hostPlatform.system} or throwSystem;
-  };
-
-  dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
-  sourceRoot = ".";
-
-  installPhase = ''
-    install -D btsync "$out/bin/btsync"
-    patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync"
-  '';
-
-  meta = {
-    description = "Automatically sync files via secure, distributed technology";
-    homepage    = https://www.getsync.com/;
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de397996b2a..acd02e0d8f7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -49,6 +49,9 @@ mapAliases ({
   bashCompletion = bash-completion; # Added 2016-09-28
   bridge_utils = bridge-utils;  # added 2015-02-20
   btrfsProgs = btrfs-progs; # added 2016-01-03
+  bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
+  bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
+  bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03
   buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
   bundler_HEAD = bundler; # added 2015-11-15
   cantarell_fonts = cantarell-fonts; # added 2018-03-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6246cc4a5fb..3af78b9f552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20043,10 +20043,6 @@ in
 
   resilio-sync = callPackage ../applications/networking/resilio-sync { };
 
-  bittorrentSync = bittorrentSync14;
-  bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
-  bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
-
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };