Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200' | Alyssa Ross | 2021-09-13 |
| | | | | | Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl | ||
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable' | Alyssa Ross | 2021-04-12 |
| | |||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065' | Alyssa Ross | 2019-09-16 |
| | |||
* | Merge commit '2d2f10475138b7206572dc3ec288184df2be022e' | Alyssa Ross | 2019-02-07 |
| | |||
* | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 |