nixos/dnsmasq: Use attrs instead of plain text config

[KoviRobi]

This should make it easier to configure in multiple places, override defaults, etc. Not sure if change is significant enough to warrant an entry in NixOS release notes.

I guess NixOS/rfcs#42 is related.

Description of changes

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 22.11 Release Notes (or backporting 22.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[RaitoBezarius]

LGTM

[RaitoBezarius]

Could you move the release notes to 23.05 now?

[RaitoBezarius]

Seems like this needs a rebase on master due to conflicts.

[KoviRobi]

Of course!

Idle thought, I suspect there's going to be plenty of conflicts like this, until the release note grows big enough that the insert in arbitrary position works well for the merge resolution. I wonder if we could have the release note options included as files, as a glob (e.g. release-notes/23.05/*.md), adding new files wouldn't have conflicts like this?

[RaitoBezarius]

Of course!

Idle thought, I suspect there's going to be plenty of conflicts like this, until the release note grows big enough that the insert in arbitrary position works well for the merge resolution. I wonder if we could have the release note options included as files, as a glob (e.g. release-notes/23.05/*.md), adding new files wouldn't have conflicts like this?

That seems like a good idea, but I think it's not a big deal that stuff like this happens, release notes grows big enough very quickly in general, you can rebase if you want :).

[KoviRobi]

Whoops, I realised I forgot to bump the version in the release notes when I moved it over, done now.

[RaitoBezarius]

@KoviRobi Alas more conflicts. :'( ; please resolve them and I will merge so we can finally enjoy RFC42 on this :D.

[KoviRobi]

No worries, and sorry it's taking so long

[RaitoBezarius]

No worries, and sorry it's taking so long

I am the one sorry :)

[RaitoBezarius]

@ofborg test schleuder dnscrypt-proxy2

[KoviRobi]

@RaitoBezarius No worries, I know everyone has been very busy with 22.11, plus also it's winter so I don't know about you but I get less done due to less sunlight. (But also sadly I have been struggling to be as active for Nix stuff in the past two and a half years)

[KoviRobi]

Looks like that didn't work? Let's try that again

@ofborg test schleuder dnscrypt-proxy2

EDIT: Ah looks like ofborg doesn't leave comments anymore

[RaitoBezarius]

Thank you a lot @KoviRobi ! (indeed, I miss spring!)

[c4710n]

@KoviRobi Sorry to bother you. But how to express the following config after removing extraConfig?

interface=lo
interface=eth0

address=/example-site.private/10.128.0.1
address=/example-service.private/10.128.0.2

According to the dnsmasq/dnsmasq.conf.example, above content is a valid config.

[c4710n]

attribute set of (atom (null, bool, int, float or string) or a list of them for duplicate keys)

Ah, found it. Sorry to bother you, again. ;)