Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916' | Alyssa Ross | 2021-06-23 |
| | | | | | # Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix | ||
* | nixpkgs: merge nixos-unstable | Alyssa Ross | 2021-02-16 |
| | |||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | |||
* | Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe' | Alyssa Ross | 2021-01-12 |
| | |||
* | Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c' | Alyssa Ross | 2020-06-04 |
| | |||
* | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |
| | |||
* | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 |