|
Conflicts:
nixpkgs/nixos/modules/config/console.nix
nixpkgs/nixos/modules/services/mail/mailman.nix
nixpkgs/nixos/modules/services/mail/public-inbox.nix
nixpkgs/nixos/modules/services/mail/rss2email.nix
nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
nixpkgs/pkgs/applications/window-managers/sway/default.nix
nixpkgs/pkgs/build-support/go/module.nix
nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
nixpkgs/pkgs/development/interpreters/python/default.nix
nixpkgs/pkgs/development/node-packages/overrides.nix
nixpkgs/pkgs/development/tools/b4/default.nix
nixpkgs/pkgs/servers/dict/dictd-db.nix
nixpkgs/pkgs/servers/mail/public-inbox/default.nix
nixpkgs/pkgs/tools/security/pinentry/default.nix
nixpkgs/pkgs/tools/text/unoconv/default.nix
nixpkgs/pkgs/top-level/all-packages.nix
|