diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 03fbd29a191..ac8f008069a 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -33,8 +33,9 @@ in service called tarsnap-backup which is periodically run by cron, or you may run it on-demand. - See Getting Started - Tarsnap page. + See the Tarsnap Getting + Started page. ''; }; @@ -46,7 +47,7 @@ in full name will be label-$(date+"%Y%m%d%H%M%S"). For example, by default your backups will look similar to - nixos-20140301021501. + nixos-20140301011501. ''; }; @@ -110,8 +111,8 @@ in default = "15 01 * * *"; description = '' This option defines (in the format used by cron) when - tarsnap is run for backups. The default is to update at - 01:15 at night every day. + tarsnap is run for backups. The default is to backup the + specified paths at 01:15 at night every day. ''; }; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 34c3af16126..61f2d0c6e20 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -120,8 +120,8 @@ stdenv.mkDerivation rec { meta = { description = "Spark cluster computing"; homepage = "http://spark.incubator.apache.org"; - platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 0f3b87361f8..4701d774dfd 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "A tool for checking security bits on executables"; homepage = "http://www.trapkit.de/tools/checksec.html"; - platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index 54209673359..a82804cb837 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight script-based dynamic tracing tool for Linux."; homepage = "http://www.ktap.org"; - platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix index 251c9126056..0f84cfa6ebc 100644 --- a/pkgs/tools/security/cb0cat/default.nix +++ b/pkgs/tools/security/cb0cat/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "cryptographic tool based on the CBEAMr0 sponge function"; homepage = "https://www.cblnk.com"; - platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; }