nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'	Alyssa Ross	2023-10-20
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
*	Merge https://github.com/NixOS/nixpkgs	Alyssa Ross	2023-09-01
\|
*	Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'	Alyssa Ross	2023-02-08
\|
*	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 '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
\|
*	Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'	Alyssa Ross	2019-09-16
\|
*	Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'	Alyssa Ross	2019-04-14
\|
*	Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'	Alyssa Ross	2019-01-07
	git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199