| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| * | 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 '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | | |||
| * | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | | |||
| * | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |