Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '3239fd2b8f728106491154b44625662e10259af2' | Alyssa Ross | 2022-03-16 |
| | | | | | Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix | ||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | |||
* | Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73' | Alyssa Ross | 2020-04-01 |
| | |||
* | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | |||
* | Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d' | Alyssa Ross | 2019-08-14 |
| | | | | v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix | ||
* | 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 |