nixlib - Alyssa's collection of Nix expressions

	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 '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD	Alyssa Ross	2023-10-31
\|
*	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 '00e27c78d3d2de6964096ceee8d70e5b487365e3'	Alyssa Ross	2022-03-31
\| \| \| \| \| \| \| \| \| \|	Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
*	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 '1a57d96edd156958b12782e8c8b6a374142a7248'	Alyssa Ross	2021-01-15
\|
*	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 'b47873026c7e356a340d0e1de7789d4e8428ac66'	Alyssa Ross	2020-05-18