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 commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |