| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-15 |
| | | |||
| * | Merge commit '93883402a445ad467320925a0a5dbe43a949f25b' | Alyssa Ross | 2022-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 '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | | |||
| * | Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe' | Alyssa Ross | 2021-01-12 |