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 '3239fd2b8f728106491154b44625662e10259af2'	Alyssa Ross	2022-03-16
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
*	Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'	Alyssa Ross	2022-03-11
\| \| \| \| \| \| \| \| \| \|	Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
*	Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'	Alyssa Ross	2022-02-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
*	Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'	Alyssa Ross	2021-06-23
	# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix