Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixos: Provide a defaultText for type = package

We don't want to build all those things along with the manual, so that's
what the defaultText attribute is for.

Unfortunately a few of them were missing, so let's add them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

aszlig 7bdcfb33 60c7bd12

+7
+1
nixos/modules/services/computing/slurm/slurm.nix
··· 37 37 package = mkOption { 38 38 type = types.package; 39 39 default = pkgs.slurm-llnl; 40 + defaultText = "pkgs.slurm-llnl"; 40 41 example = literalExample "pkgs.slurm-llnl-full"; 41 42 description = '' 42 43 The packge to use for slurm binaries.
+1
nixos/modules/services/misc/matrix-synapse.nix
··· 61 61 package = mkOption { 62 62 type = types.package; 63 63 default = pkgs.matrix-synapse; 64 + defaultText = "pkgs.matrix-synapse"; 64 65 description = '' 65 66 Overridable attribute of the matrix synapse server package to use. 66 67 '';
+1
nixos/modules/services/misc/plex.nix
··· 58 58 package = mkOption { 59 59 type = types.package; 60 60 default = pkgs.plex; 61 + defaultText = "pkgs.plex"; 61 62 description = '' 62 63 The Plex package to use. Plex subscribers may wish to use their own 63 64 package here, pointing to subscriber-only server versions.
+1
nixos/modules/services/networking/consul.nix
··· 33 33 package = mkOption { 34 34 type = types.package; 35 35 default = pkgs.consul; 36 + defaultText = "pkgs.consul"; 36 37 description = '' 37 38 The package used for the Consul agent and CLI. 38 39 '';
+1
nixos/modules/services/networking/ejabberd.nix
··· 32 32 package = mkOption { 33 33 type = types.package; 34 34 default = pkgs.ejabberd; 35 + defaultText = "pkgs.ejabberd"; 35 36 description = "ejabberd server package to use"; 36 37 }; 37 38
+1
nixos/modules/services/security/haka.nix
··· 59 59 60 60 package = mkOption { 61 61 default = pkgs.haka; 62 + defaultText = "pkgs.haka"; 62 63 type = types.package; 63 64 description = " 64 65 Which Haka derivation to use.
+1
nixos/modules/services/web-servers/apache-httpd/owncloud.nix
··· 370 370 package = mkOption { 371 371 type = types.package; 372 372 default = pkgs.owncloud70; 373 + defaultText = "pkgs.owncloud70"; 373 374 example = literalExample "pkgs.owncloud70"; 374 375 description = '' 375 376 PostgreSQL package to use.