movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging-next' into staging

Browse source 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
This commit is contained in:
Jan Tojnar 2021-06-16 19:58:58 +02:00
commit e3dfa79441
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
302 changed files with 4749 additions and 1688 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -840,6 +840,7 @@
./services/networking/tox-node.nix
./services/networking/toxvpn.nix
./services/networking/tvheadend.nix
./services/networking/ucarp.nix
./services/networking/unbound.nix
./services/networking/unifi.nix
./services/networking/v2ray.nix