Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable-small' | Alyssa Ross | 2024-05-07 |
| | | | | | | | 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 branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-03-01 |
| | |||
* | Merge commit 'e3474e1d1e53' | Alyssa Ross | 2024-02-26 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-20 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-13 |
| | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix | ||
* | 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 https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-01 |
| | |||
* | Merge branch 'staging' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-22 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-16 |