diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-11-15 22:34:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 22:34:38 +0100 |
| commit | a105b3aff995fb734de84ac5c0d2164962bc65c5 (patch) | |
| tree | 076c271d0d4481104d51abcc74b2ec62d83ca671 | |
| parent | 7df3d7446f868170848227cd972fa833c827f07c (diff) | |
| parent | 008399e9de050842f67361fdc911d6b526fca287 (diff) | |
| download | nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.tar nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.tar.gz nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.tar.bz2 nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.tar.lz nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.tar.xz nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.tar.zst nixpkgs-a105b3aff995fb734de84ac5c0d2164962bc65c5.zip | |
Merge pull request #20392 from jerith666/cp-48
crashplan: 4.7.0r2 -> 4.8.0r1
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/backup/crashplan.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/backup/crashplan/default.nix | 9 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 75310f9f09a..2ad631cb19a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -201,6 +201,7 @@ jbedo = "Justin Bedő <cu@cua0.org>"; jcumming = "Jack Cummings <jack@mudshark.org>"; jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>"; + jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>"; jfb = "James Felix Black <james@yamtime.com>"; jgeerds = "Jascha Geerds <jascha@jgeerds.name>"; jgillich = "Jakob Gillich <jakob@gillich.me>"; 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..1a125de0a87 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 ]; @@ -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 ]; @@ -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 |