| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997' | Alyssa Ross | 2021-06-22 |
| | | | | | | | | | | # Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix | ||
| * | Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | | |||
| * | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
| git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 | |||