From ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 13 Nov 2016 14:04:43 -0500 Subject: crashplan: 4.7.0r2 -> 4.8.0r1 --- nixos/modules/services/backup/crashplan.nix | 2 +- pkgs/applications/backup/crashplan/default.nix | 7 +++---- 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 -- cgit 1.4.1 From 008399e9de050842f67361fdc911d6b526fca287 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 13 Nov 2016 14:41:57 -0500 Subject: add self to crashplan maintainers --- lib/maintainers.nix | 1 + pkgs/applications/backup/crashplan/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 735fc427c3c..dbe45ee010a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -198,6 +198,7 @@ jb55 = "William Casarin "; jcumming = "Jack Cummings "; jefdaj = "Jeffrey David Johnson "; + jerith666 = "Matt McHenry "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; jgillich = "Jakob Gillich "; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 94893a01c74..1a125de0a87 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi domenkozar ]; + maintainers = with maintainers; [ sztupi domenkozar jerith666 ]; }; buildInputs = [ makeWrapper cpio ]; -- cgit 1.4.1