···1313 '';
1414 };
1515 zone_type = mkOption {
1616- type = types.enum [ "Primary" "Secondary" "Hint" "Forward" ];
1616+ type = types.enum [ "Primary" "Secondary" "External" ];
1717 default = "Primary";
1818 description = ''
1919 One of:
2020 - "Primary" (the master, authority for the zone).
2121 - "Secondary" (the slave, replicated from the primary).
2222- - "Hint" (a cached zone with recursive resolver abilities).
2323- - "Forward" (a cached zone where all requests are forwarded to another resolver).
2222+ - "External" (a cached zone that queries other nameservers).
24232524 For more details about these zone types, consult the documentation for BIND,
2625 though note that hickory-dns supports only a subset of BIND's zone types:
···2827 '';
2928 };
3029 file = mkOption {
3131- type = types.either types.path types.str;
3232- default = "${config.zone}.zone";
3333- defaultText = literalExpression ''"''${config.zone}.zone"'';
3030+ type = types.nullOr (types.either types.path types.str);
3131+ default = if config.zone_type != "External" then "${config.zone}.zone" else null;
3232+ defaultText = literalExpression ''if config.zone_type != "External" then "''${config.zone}.zone" else null'';
3433 description = ''
3534 Path to the .zone file.
3635 If not fully-qualified, this path will be interpreted relative to the `directory` option.
3737- If omitted, defaults to the value of the `zone` option suffixed with ".zone".
3636+ If omitted, defaults to the value of the `zone` option suffixed with ".zone" when `zone_type` isn't External; otherwise, defaults to `null`.
3837 '';
3938 };
4039 };
···8281 configFile = mkOption {
8382 type = types.path;
8483 default = toml.generate "hickory-dns.toml" (
8585- lib.filterAttrsRecursive (_: v: v != null) cfg.settings
8484+ lib.mapAttrs (_: v: if builtins.isList v then map (v: if builtins.isAttrs v then lib.filterAttrs (_: v: v != null) v else v) v else v) (lib.filterAttrsRecursive (_: v: v != null) cfg.settings)
8685 );
8786 defaultText = lib.literalExpression ''
8887 let toml = pkgs.formats.toml { }; in toml.generate "hickory-dns.toml" cfg.settings
+3-2
pkgs/applications/audio/raysession/default.nix
···12121313buildPythonApplication rec {
1414 pname = "raysession";
1515- version = "0.14.3";
1515+ version = "0.14.4";
16161717 src = fetchurl {
1818 url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz";
1919- sha256 = "sha256-3+g1zdjGkxNEpyuKuxzhr2p9gkEFjYAso4fPedbjmlY=";
1919+ sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
2020 };
21212222 postPatch = ''
···2424 substituteInPlace Makefile --replace '$(DESTDIR)/' '$(DESTDIR)$(PREFIX)/'
2525 # Do not wrap an importable module with a shell script.
2626 chmod -x src/daemon/desktops_memory.py
2727+ chmod -x src/clients/jackpatch/main_loop.py
2728 '';
28292930 format = "other";
···6677buildPythonPackage rec {
88 pname = "plotext";
99- version = "5.2.8";
99+ version = "5.3.2";
1010 format = "setuptools";
11111212 src = fetchFromGitHub {
1313 owner = "piccolomo";
1414 repo = pname;
1515 tag = version;
1616- hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs=";
1616+ hash = "sha256-4cuStXnZFTlOoBp9w+LrTZavCWEaQdZMY4apGNKvBXE=";
1717 };
18181919 # Package does not have a conventional test suite that can be run with either