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 branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs	Alyssa Ross	2023-08-26
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/build-support/go/module.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 '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 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'	Alyssa Ross	2021-09-13
\|
*	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 remote-tracking branch 'nixpkgs/nixos-unstable'	Alyssa Ross	2021-04-12
\|
*	Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'	Alyssa Ross	2021-01-26
\|
*	Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'	Alyssa Ross	2021-01-15
\|
*	Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'	Alyssa Ross	2020-06-04
\|
*	Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'	Alyssa Ross	2020-04-27
\|
*	Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'	Alyssa Ross	2020-01-11
\|
*	Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'	Alyssa Ross	2019-05-17
\|
*	Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'	Alyssa Ross	2019-01-07
	git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199