Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-01 |
| | |||
* | Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916' | Alyssa Ross | 2021-06-23 |
| | | | | | # Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix | ||
* | 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 '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | |||
* | Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73' | Alyssa Ross | 2020-04-01 |
| | |||
* | Merge commit '100012e55bc2a82fc680cba31a426ad38ead6fab' | Alyssa Ross | 2020-01-14 |
| | |||
* | Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065' | Alyssa Ross | 2019-09-16 |
| | |||
* | Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5' | Alyssa Ross | 2019-06-18 |
| | |||
* | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 |