Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3' | Alyssa Ross | 2022-03-31 |
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix |