diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-21 08:02:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-21 08:02:10 +0100 |
| commit | 5871da418fffdbf286f8fa8ad743f7d76a62baa6 (patch) | |
| tree | 4f2ee1f353fd6682d3505706d359f1e6d6a64ab5 /pkgs/tools/backup | |
| parent | eb22e4c775a9cbed876bfc743a59cc314f11b75b (diff) | |
| parent | e2cd07b9978198696681776405c4e23526d483a7 (diff) | |
| download | nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.gz nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.bz2 nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.lz nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.xz nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.zst nixlib-5871da418fffdbf286f8fa8ad743f7d76a62baa6.zip | |
Merge staging into python-unstable
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/easysnap/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/backup/pyznap/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/tools/backup/restic/default.nix | 4 |
3 files changed, 33 insertions, 5 deletions
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index d8643dbf9074..ceb6feae3962 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "easysnap-${version}"; - version = "unstable-2018-11-20"; + version = "unstable-2019-02-17"; src = fetchFromGitHub { owner = "sjau"; repo = "easysnap"; - rev = "dbf58c06a339cb040dbdcaf7e6ffec5af4add3c7"; - sha256 = "0rvikmj2k103ffgnvkway8n6ajq0vzwcxb4l5vhka1hqh8047lam"; + rev = "9ef5d1ff51ccf9939a88b7b32b4959d27cf61ecc"; + sha256 = "0m0217ni909nham15w5vxg8y7cw2zwjibnhvgnpxxsap8zkhv1m4"; }; installPhase = '' diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix new file mode 100644 index 000000000000..e37327c429d5 --- /dev/null +++ b/pkgs/tools/backup/pyznap/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonApplication +, fetchPypi +, paramiko +, configparser +}: + +buildPythonApplication rec { + pname = "pyznap"; + version = "1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ac0da5d7f6461d1d6f128362786e297144b415f9e3a2f1835642ab3dda82d55"; + }; + + propagatedBuildInputs = [ configparser paramiko ]; + + # tests aren't included in the PyPI packages + doCheck = false; + + meta = { + homepage = "https://github.com/yboetz/pyznap"; + description = "ZFS snapshot tool written in python"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ rbrewer ]; + }; +} diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 453e31f5d13a..7b039f93a039 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.2"; + version = "0.9.4"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0kl8yk636i3y7f2kd43pydjh4pv7hhq09p5k54jlysnrbf2kjb4h"; + sha256 = "15lx01w46bwn3hjwpmm8xy71m7ml9wdwddbbfvmk5in61gv1acr5"; }; buildPhase = '' |