diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/tools/backup | |
parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/backup')
-rw-r--r-- | nixpkgs/pkgs/tools/backup/duplicati/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/backup/iceshelf/default.nix | 35 |
2 files changed, 38 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/tools/backup/duplicati/default.nix b/nixpkgs/pkgs/tools/backup/duplicati/default.nix index d36ef7ea64fb..c774711b874c 100644 --- a/nixpkgs/pkgs/tools/backup/duplicati/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "duplicati-${version}"; - version = "2.0.3.3"; + version = "2.0.4.5"; channel = "beta"; - build_date = "2018-04-02"; + build_date = "2018-11-28"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "0hwdpsgrvm3gq648mg9g0z0rk49g71dd8r5i1a8w83pwdqv0hn9c"; + sha256 = "118rhzm8vk1092214vq7kxnmrnz4jl32lk8j90965a8pg05m53gn"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/backup/iceshelf/default.nix b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix new file mode 100644 index 000000000000..546339ca002a --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/iceshelf/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "iceshelf"; + version = "unstable-2019-07-03"; + + format = "other"; + + src = fetchFromGitHub { + owner = "mrworf"; + repo = pname; + rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; + sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; + }; + + propagatedBuildInputs = [ + git + awscli + python3.pkgs.python-gnupg + ]; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} + cp -v iceshelf iceshelf-restore $out/bin + cp -v iceshelf.sample.conf $out/share/doc/${pname}/ + cp -rv modules $out/${python3.sitePackages} + ''; + + meta = with lib; { + description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; + license = licenses.lgpl2; + homepage = "https://github.com/mrworf/iceshelf"; + maintainers = with maintainers; [ mmahut ]; + }; +} |