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 'a343533bccc62400e8a9560423486a3b6c11a23b' | Alyssa Ross | 2024-03-22 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-06 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-12 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-06-16 |
| | | | | | | | | | | | | | | | | | | | | | | Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix 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/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix | ||
* | 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 'a323570a264da96a0b0bcc1c9aa017794acdc752' | Alyssa Ross | 2022-01-07 |
| | |||
* | Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42' | Alyssa Ross | 2021-09-13 |
| | |||
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable' | Alyssa Ross | 2021-04-12 |
| | |||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | |||
* | Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe' | Alyssa Ross | 2021-01-12 |
| | |||
* | 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 '90441b4b47fc7280de6a5bd1a228017caaa0f97f' | Alyssa Ross | 2020-01-22 |
| | |||
* | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | |||
* | Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704' | Alyssa Ross | 2019-09-28 |
| | |||
* | Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065' | Alyssa Ross | 2019-09-16 |
| | |||
* | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |