about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/tools/htmlq
Commit message (Collapse)AuthorAge
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-15
|
* Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'Alyssa Ross2022-03-11
| | | | | | | | | | Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
* Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'Alyssa Ross2021-09-27
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
* Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'Alyssa Ross2021-09-13
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl