Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit f3ad1c5a40 - Show all commits

View file

@ -293,6 +293,7 @@ in {
# s3ql # s3ql
# rclone # rclone
rsync rsync
duplicacy
# Filesystem Tools # Filesystem Tools
ntfs3g ntfs3g

View file

@ -27,6 +27,7 @@ in {
}; };
just = pkgs.callPackage ../../pkgs/just.nix {}; just = pkgs.callPackage ../../pkgs/just.nix {};
duplicacy = pkgs.callPackage ../../pkgs/duplicacy {};
}; };
}; };