| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge commit 'd8fe5e6c' | Alyssa Ross | 2024-04-10 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-03-24 |
| | | |||
| * | Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33' | Alyssa Ross | 2023-02-08 |
| | | |||
| * | Merge commit '3239fd2b8f728106491154b44625662e10259af2' | Alyssa Ross | 2022-03-16 |
| | | | | | | Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix | ||
| * | Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44' | Alyssa Ross | 2021-07-23 |
| | | |||
| * | 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 remote-tracking branch 'nixpkgs/nixos-unstable' | Alyssa Ross | 2021-04-12 |
| | | |||
| * | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | | |||
| * | Merge commit '9480bae337095fd24f61380bce3174fdfe926a00' | Alyssa Ross | 2020-07-13 |
| | | | | | | | This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first. | ||
| * | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | | |||
| * | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | | |||
| * | Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704' | Alyssa Ross | 2019-09-28 |
| | | |||
| * | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |
| | | |||
| * | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
| git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 | |||