| 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 branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-08-26 |
| | | | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix | ||
| * | Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916' | Alyssa Ross | 2021-06-23 |
| | | | | | | # Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix | ||
| * | Merge remote-tracking branch 'nixpkgs/nixos-unstable' | Alyssa Ross | 2021-04-12 |
| | | |||
| * | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | | |||
| * | Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | | |||
| * | Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704' | Alyssa Ross | 2019-09-28 |
| | | |||
| * | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |
| | | |||
| * | Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61' | Alyssa Ross | 2019-03-16 |
| | | |||
| * | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
| git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 | |||