| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'nixpkgs/nixos-unstable-small' | Alyssa Ross | 8 days |
| | | | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix | ||
| * | 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 'a343533bccc62400e8a9560423486a3b6c11a23b' | Alyssa Ross | 2024-03-22 |
| | | |||
| * | 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-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-15 |
| | | |||
| * | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-07 |
| | | |||
| * | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-01 |
| | | |||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵ | Alyssa Ross | 2023-11-16 |
| | | | | | HEAD | ||
| * | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-05 |
| | | | | | | Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix | ||
| * | Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8' | Alyssa Ross | 2023-10-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-13 |
| Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391 | |||