Merge branch 'master' into staging-next

2019-09-18 21:15:35 +02:00
parent fa4a3af5a7 6b3832a519
commit 62791c3743
167 changed files with 11105 additions and 6483 deletions
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Online backups for the truly paranoid";
    homepage    = "http://www.tarsnap.com/";
-    license     = "tarsnap";
+    license     = stdenv.lib.licenses.unfree;
    platforms   = stdenv.lib.platforms.unix;
    maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ];
  };