diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-12-06 03:28:13 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-12-06 03:28:13 +0100 |
| commit | 6ce08f74dc7518d35aa52f9b83fa84ae716854b8 (patch) | |
| tree | c12cdeb6c62a403a2c3ac9c275569b3913b3c2b6 /nixos | |
| parent | 72b795557e2040a58c936185cb87ecb136e66df3 (diff) | |
| parent | 18493dab889d8afbefde6380c7b00fae3d376d3e (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2103.xml | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/zigbee2mqtt.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 87a99f9ac8e7..ffb00aa0362e 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -32,7 +32,7 @@ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finnally</link> packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. - Additionally, the attribute <code>gnuradio<code> and <code>gnuradio3_7<code> + Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code> now point to an externally wrapped by default derivations, that allow you to also add `extraPythonPackages` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/misc/zigbee2mqtt.nix index 0957920f1a09..cd987eb76c76 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/misc/zigbee2mqtt.nix @@ -70,6 +70,7 @@ in description = "Zigbee2mqtt Service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + environment.ZIGBEE2MQTT_DATA = cfg.dataDir; serviceConfig = { ExecStart = "${cfg.package}/bin/zigbee2mqtt"; User = "zigbee2mqtt"; |