1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-22 17:31:04 +03:00
Commit graph

3748 commits

Author SHA1 Message Date
Vladimír Čunát
2ec92384d7
Merge #258361: nixos/knot: compatibility with 23.05 config 2023-10-08 10:16:06 +02:00
Vladimír Čunát
6b66e2fc9c
nixos/knot: compatibility with 23.05 config
- run conf-check iff keyFiles == [] (like in 23.05; this was my bug)
- support extraConfig + keyFiles

- but warning will still be shown if extraConfig is used,
  and it might be slightly confusing
2023-10-08 10:14:54 +02:00
Alyssa Ross
182718fecc
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/top-level/linux-kernels.nix
2023-10-07 19:52:18 +00:00
Lin Jian
4a5f3d5a50
Merge pull request #259228 from nbdd0121/patch-1
nixos/dnsmasq: allow custom package
2023-10-07 21:04:22 +08:00
Gary Guo
7094f1ec0e nixos/dnsmasq: allow custom package
Allow a custom package to be used for dnsmasq service.
2023-10-07 11:53:25 +01:00
Lin Jian
272dba1e31
Merge pull request #257415 from ehmry/yggdrasil
nixos/yggdrasil: add extraArgs option
2023-10-07 02:05:36 +08:00
Aaron Andersen
76fb9da41f nixos/openssh: add support for authorized principals 2023-10-06 13:57:19 -04:00
Bjørn Forsman
e5b8b12ac9 nixos/coredns: add extraArgs option 2023-10-06 19:38:38 +02:00
Emery Hemingway
3fc4ecafeb nixos/yggdrasil: add extraArgs option 2023-10-06 17:59:14 +01:00
lassulus
82b59a8fb2 nixos/syncthing: match stale ids by subtracting in jq 2023-10-05 23:08:05 +02:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Maximilian Bosch
e515dce892 nixos/sshd: fix sshd.conf validity check
When using e.g. `{ addr = "[::]"; port = 22; }` at `listenAddresses`,
the check fails because of an escaping issue[1] with

    last 1 log lines:
    > Invalid test mode specification -f
    For full logs, run 'nix log /nix/store/c6pbpw5hjkjgipmarwyic9zyqr1xaix5-check-sshd-config.drv'

Using `lib.escapeShellArg` appears to solve the problem.

[1] https://github.com/NixOS/nixpkgs/pull/256090#issuecomment-1738063528
2023-09-28 00:11:31 +00:00
Fabián Heredia Montiel
312aa96fe6
Merge pull request #256565 from bjornfor/nixos-wireguard-add-metric-option
nixos/wireguard: add metric option
2023-09-25 21:15:02 -06:00
Weijia Wang
c71554840b
Merge pull request #257104 from vifino/unifi-7.5.176
unifi7: 7.4.156 -> 7.5.176
2023-09-25 23:43:16 +02:00
Aaron Andersen
c51a273a92
Merge pull request #254370 from jakubgs/mtr-exporter/multi-job
mtr-exporter: support specifying multiple jobs
2023-09-24 11:39:23 -04:00
Adrian Pistol
191131077b unifi7: 7.4.156 -> 7.5.176 2023-09-24 17:25:08 +02:00
Maximilian Bosch
9bd9e20e9a
Merge pull request #256090 from CRTified/sshd-validation-fix
nixos/sshd: Specify connection parameters for configuration validation
2023-09-24 14:12:46 +02:00
Aryeh Hillman
b6766564ed Update wg-quick.nix
Update wg-quick.nix such that a search for `WireGuard` in the `NixOS Options` section of search.nixos.org brings up the convenient `networking.wg-quick.interfaces.wg0.configFile` option.
2023-09-24 13:24:27 +02:00
Jakub Sokołowski
4e587ac821
mtr-exporter: support specifying multiple jobs
This ability has been added in `0.3.0` release:
https://github.com/mgumz/mtr-exporter/releases/tag/0.3.0
https://github.com/NixOS/nixpkgs/pull/252667

To achieve this a config is generated and symlinked at `/etc/mtr-exporter.conf`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2023-09-24 09:13:31 +02:00
Vladimír Čunát
1869818c57
nixos/knot: add release notes and partial compatibility 2023-09-23 10:05:17 +02:00
Vladimír Čunát
ce85980e77
nixos/knot: also allow config by YAML file 2023-09-23 10:04:02 +02:00
Vladimír Čunát
7fb737dde6
nixos/knot: allow full configuration by nix values (RFC 42) 2023-09-23 10:04:02 +02:00
Bjørn Forsman
ed7c0c6e75 nixos/wireguard: add metric option
This new option, networking.wireguard.interfaces.NAME.metric, allows
increasing the metric of the routes, effectively lowering priority.

(I'm using high metric to allow having the Wireguard interface always
up, even when the client machines are on their home network. Before I
had to stop the interface when home to avoid packet routing issues.)
2023-09-21 22:19:21 +02:00
Sandro Jäckel
9a85d77152
nixos/networkmanager: default firewallBackend to nftables, remove firewallBackend
Co-authored-by: Florian Klink <flokli@flokli.de>

Co-authored-by: Lin Jian <me@linj.tech>
2023-09-21 16:18:57 +02:00
Sandro Jäckel
ad0ca163e1
nixos/networkmanager: cleanup, fix example rendering 2023-09-21 15:16:54 +02:00
zaldnoay
79599c86ae nixos/frp: fix example url of configure file 2023-09-20 13:55:53 +08:00
Carl Richard Theodor Schneider
716bde190c nixos/sshd: specify lport,laddr for config validation 2023-09-19 18:13:44 +02:00
zaldnoay
6cd38e43cd nixos/frp: init 2023-09-17 14:37:19 +08:00
Robert Schütz
1f832ad576
Merge pull request #254306 from dotlambda/tedicross-drop
nodePackages.tedicross: drop
2023-09-15 17:23:54 +00:00
Markus Theil
8e5d42e8e9 nixos/frr: add mgmtd to service list
mgmtd is a new service in frr >= 9.0.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-09-15 13:19:19 +02:00
Robert Schütz
536969cad3 nodePackages.tedicross: drop
It fails to build with

    npm ERR! code 1
    npm ERR! path /nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium
    npm ERR! command failed
    npm ERR! command sh -c node install.js --preinstall
    npm ERR! Static libsodium was not found at /nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium/deps/build/lib/libsodium so compiling libsodium from source.
    npm ERR! automake is required, but wasn't found on this system
    npm ERR! make: *** [Makefile:62: libsodium] Error 1
    npm ERR! /nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium/install.js:287
    npm ERR!             throw new Error(cmdLine + ' exited with code ' + code);
    npm ERR!             ^
    npm ERR!
    npm ERR! Error: make libsodium exited with code 2
    npm ERR!     at ChildProcess.<anonymous> (/nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium/install.js:287:19)
    npm ERR!     at ChildProcess.emit (node:events:514:28)
    npm ERR!     at ChildProcess._handle.onexit (node:internal/child_process:291:12)
    npm ERR!
    npm ERR! Node.js v18.17.1
2023-09-13 15:00:38 -07:00
Mario Rodas
5f9390646a
Merge pull request #254827 from hanleym/trust-dns
trust-dns: 0.22.1 -> 0.23.0
2023-09-13 06:56:03 -05:00
Ryan Lahfa
eb23738e85
Merge pull request #252283 from flokli/fcc-unlock-extra 2023-09-13 10:18:06 +02:00
chayleaf
7bfaf94b1e miniupnpd-nftables: init at 2.3.3 2023-09-13 13:06:59 +07:00
Michael Hanley
a60936606c trust-dns: 0.22.1 -> 0.23.0 2023-09-12 18:06:33 -04:00
Fabián Heredia Montiel
cc1fdc5376
Merge pull request #254181 from StillerHarpo/adguardhome
nixos/adguardhome: Fix openFirewall
2023-09-12 16:23:16 -05:00
Florian Klink
5d3ca06db3 nixos/modemmanager: remove enableBundledFccUnlockScripts option
This removes the networking.networkmanager.enableBundledFccUnlockScripts
option, and updates the release notes.
2023-09-12 22:57:31 +02:00
Florian Klink
8606f6c8e1 nixos/modemmanager: support additional FCC unlock scripts
This commit introduces a `networking.networkmanager.fccUnlockScripts`
option, which allows specifying additional, usually vendor-provided
unlock scripts.

networking.networkmanager.enableBundledFccUnlockScripts is refactored to
make use of the same mechanism internally.
2023-09-12 16:55:15 +02:00
Florian Klink
0bfc763df2 nixos/modemmanager: enableFccUnlock -> enableBundledFccUnlockScripts
PR #155414 introduced an option to support enabling the FCC unlock
scripts that ModemManager provides, but since 1.18.4 doesn't execute
anymore.

However, this option is specifically only about the unlock scripts
provided with ModemManager so far. Rename the option to make this more
obvious.
2023-09-12 16:55:15 +02:00
Florian Klink
5626174a09 nixos/networkmanager: nixpkgs-fmt 2023-09-12 16:55:15 +02:00
lelgenio
4f802070e5 nixos/websockify: use python3 websockify 2023-09-12 10:50:57 -03:00
oluceps
1ff1751906
nixos/dae: use port type instead int 2023-09-12 11:38:33 +08:00
oluceps
bc07451d4f
nixos/dae: fix override existed config issue 2023-09-12 00:29:56 +08:00
Maximilian Bosch
863598fdfc
Merge pull request #253427 from Yarny0/sshd-requiredrsasize
nixos/sshd: don't validate mock host key, permit `RequiredRSASize`
2023-09-11 17:40:23 +02:00
Yorick
df123af8b8
Merge pull request #248502 from kurnevsky/wstunnel
wstunnel: correct listen option
2023-09-09 18:45:45 +02:00
Florian Engel
20acd199f4
nixos/adguardhome: Fix openFirewall
When not setting `settings` and setting `openFirewall = true`
evaluation would fail because it tries to access `settings.bind_port`
while `settings == null`
2023-09-09 08:19:22 +02:00
Weijia Wang
cfb61436d7
Merge pull request #252978 from oluceps/dae-upup
dae,nixos/dae: 0.2.4 -> 0.3.0
2023-09-05 23:57:14 +02:00
Yarny0
bbefd70784 nixos/sshd: avoid mock host key, permit RequiredRSASize
With this commit, the validation of `sshd_config`
is performed with `sshd -G` instead of `sshd -t`.
The former does not require a valid host key.
Checking the host key was never useful for us:
We just generated a dummy host key to
make the validation mechanism happy.
With this change the dummy key is no longer needed.

This change not only saves some CPU cycles
(avoid the generation of an RSA key),
but it also permits to set `RequiredRSASize` to a value
larger than the current rsa key default size (3072).
2023-09-05 11:34:09 +02:00
Maciej Krüger
ca6ed1cc8d
Merge pull request #241680 from 4z3/networking.nftables.checkRulesetRedirects 2023-09-04 22:07:50 +02:00
rnhmjoj
355a9fa040
nixos/jool: allow to manage multiple instances 2023-09-04 18:38:25 +02:00