nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'	Alyssa Ross	2023-02-08
\|
*	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 '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
*	Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'	Alyssa Ross	2021-01-26
\|
*	Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'	Alyssa Ross	2021-01-12