| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-20 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
| * | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-01 |
| | | |||
| * | Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752' | Alyssa Ross | 2022-01-07 |
| | | |||
| * | 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 | |||