nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	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 into ↵	Alyssa Ross	2023-11-16
\| \| \| \|	HEAD
*	Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs	Alyssa Ross	2023-08-26
\| \| \| \| \| \|	Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
*	Merge commit '3239fd2b8f728106491154b44625662e10259af2'	Alyssa Ross	2022-03-16
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.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 '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.