Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable-small' | Alyssa Ross | 8 days |
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix | ||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵ | Alyssa Ross | 2023-11-16 |
| | | | | HEAD | ||
* | 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 commit '99665eb45f58d959d2cb9e49ddb960c79d596f33' | Alyssa Ross | 2023-02-08 |
| | |||
* | nixpkgs: merge nixos-unstable | Alyssa Ross | 2021-02-16 |
| | |||
* | libhugetlbfs: init at 2.22 | Alyssa Ross | 2020-12-11 |
(cherry picked from commit 5e7d581ffdba220d088ed92f382a41acb37670e1) |