| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 '3239fd2b8f728106491154b44625662e10259af2' | Alyssa Ross | 2022-03-16 |
| | | | | | | Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.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 '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17' | Alyssa Ross | 2021-06-10 |
| | | |||
| * | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | | |||
| * | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | | |||
| * | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | | |||
| * | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |
| | | |||
| * | Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af' | Alyssa Ross | 2019-05-07 |
| | | |||
| * | Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9' | Alyssa Ross | 2019-04-22 |
| | | |||
| * | Merge commit '969cff2691a02b3d7e5468beda26c482d8986644' | Alyssa Ross | 2019-02-24 |
| | | |||
| * | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
| git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 | |||