| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'nixpkgs/nixos-unstable-small' | Alyssa Ross | 2024-05-07 |
| | | | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix | ||
| * | Merge commit 'd8fe5e6c' | Alyssa Ross | 2024-04-10 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
| * | Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b' | Alyssa Ross | 2024-03-22 |
| | | |||
| * | Merge commit 'e3474e1d1e53' | Alyssa Ross | 2024-02-26 |
| | | |||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-20 |
| | | |||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-13 |
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix | ||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-20 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-15 |
| | | |||
| * | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-07 |
| | | |||
| * | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-05 |
| | | | | | | Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix | ||
| * | Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD | Alyssa Ross | 2023-10-31 |
| | | |||
| * | Merge branch 'staging' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-22 |