Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 | 2023-11-20 |
| | |||
* | Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD | Alyssa Ross | 2023-10-31 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-08-26 |
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix |