summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatt McHenry <github@matt.mchenryfamily.org>2016-11-13 14:04:43 -0500
committerMatt McHenry <github@matt.mchenryfamily.org>2016-11-13 14:38:14 -0500
commitee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670 (patch)
tree6309527b26df40a06890632cf49c87ce967fff36
parentfa4167c0a13cbe0d97b9c88d91b86845a8c4e740 (diff)
downloadnixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.tar
nixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.tar.gz
nixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.tar.bz2
nixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.tar.lz
nixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.tar.xz
nixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.tar.zst
nixpkgs-ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670.zip
crashplan: 4.7.0r2 -> 4.8.0r1
-rw-r--r--nixos/modules/services/backup/crashplan.nix2
-rw-r--r--pkgs/applications/backup/crashplan/default.nix7
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
index 38cf8eb72fb..d0af2e416b6 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixos/modules/services/backup/crashplan.nix
@@ -49,7 +49,7 @@ with lib;
         ensureDir ${crashplan.vardir}/backupArchives 700
         ensureDir ${crashplan.vardir}/log 777
         cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
-        for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do
+        for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do
           rm -f ${crashplan.vardir}/$x;
           ln -sf ${crashplan}/$x ${crashplan.vardir}/$x;
         done
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index b6c658636bb..94893a01c74 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
 
 let
-  version = "4.7.0";
-  rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time
+  version = "4.8.0";
+  rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
 
 in stdenv.mkDerivation rec {
   name = "crashplan-${version}-r${rev}";
 
   crashPlanArchive = fetchurl {
     url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
-    sha256 = "1vi6dqf8kc90axrgdcf6rwnhynxgxkc0qn6pbdp2gvkxdqxrprn8";
+    sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs";
   };
 
   srcs = [ crashPlanArchive ];
@@ -43,7 +43,6 @@ in stdenv.mkDerivation rec {
 
     install -d -m 755 unpacked $out
 
-    install -D -m 644 EULA.txt $out/EULA.txt
     install -D -m 644 run.conf $out/bin/run.conf
     install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
     install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine