diff options
| author | cillianderoiste <cillian.deroiste@gmail.com> | 2015-03-22 19:25:05 +0100 |
|---|---|---|
| committer | cillianderoiste <cillian.deroiste@gmail.com> | 2015-03-22 19:25:05 +0100 |
| commit | 14de7bb1f5dfd43aa96cfab0dd668ebd019ba658 (patch) | |
| tree | f76bc6c3351cbbf29a04aa324e27f40ae98208f2 /pkgs/applications | |
| parent | 2ecf9aad4a2d2b9e72e72aa9d7911e1b565dc3af (diff) | |
| parent | 7ed4beec5564430f171b8dfa66c1f85c3fc73f9b (diff) | |
| download | nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.tar nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.tar.gz nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.tar.bz2 nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.tar.lz nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.tar.xz nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.tar.zst nixlib-14de7bb1f5dfd43aa96cfab0dd668ebd019ba658.zip | |
Merge pull request #6937 from bendlas/dropbox
Dropbox
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/dropbox-cli/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 51f3ae2ac8d9..1a9c7e0aa2f7 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,13 +1,14 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "1.6.2"; + version = "2.10.0"; + dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { name = "dropbox-cli-${version}"; src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3"; + sha256 = "0f765rpp357vy7zvn1jq6q48d10fi4v13yb7vv3qx3az3f3472lg"; }; buildInputs = [ pkgconfig python ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation { --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' - + sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox chmod +x "$out/bin/"* patchShebangs "$out/bin" ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ad6dac31dece..bd557a27ec07 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -26,9 +26,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "3.2.6"; - sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry" - else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz" + version = "3.2.9"; + sha256 = if stdenv.system == "x86_64-linux" then "1w1xqizd4xhf9d3gwg9wwys2rdbacs390zf4a7z76m9h5r2lz049" + else if stdenv.system == "i686-linux" then "0lzrb0b7hi22ij7fmn7i3wkzbzv99858ah7w8ysg65za0c8qwksc" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored |