diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-13 11:48:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-13 12:04:31 +0100 |
| commit | 3bcf8ae8795ede9909df07fb97e049442b38c231 (patch) | |
| tree | e6d3a37896e3655726c2dff6946f7c37ceaa821f /nixos/modules/services/amqp | |
| parent | b9f6dfe8c5c8da09b6c2d8a8e168bdcf50a0aabd (diff) | |
| download | nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.tar nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.tar.gz nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.tar.bz2 nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.tar.lz nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.tar.xz nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.tar.zst nixpkgs-3bcf8ae8795ede9909df07fb97e049442b38c231.zip | |
nixos manuals: bring back package references
This reverts most of 89e983786a, as those references are sanitized now. Fixes #10039, at least most of it. The `sane` case wasn't fixed, as it calls a *function* in pkgs to get the default value.
Diffstat (limited to 'nixos/modules/services/amqp')
| -rw-r--r-- | nixos/modules/services/amqp/activemq/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 56ff388f8a9..261f9761766 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -32,6 +32,7 @@ in { ''; }; configurationDir = mkOption { + default = "${activemq}/conf"; description = '' The base directory for ActiveMQ's configuration. By default, this directory is searched for a file named activemq.xml, @@ -125,8 +126,6 @@ in { ''; }; - services.activemq.configurationDir = mkDefault "${activemq}/conf"; - }; } |