nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	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 branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs	Alyssa Ross	2023-06-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
*	Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'	Alyssa Ross	2023-02-08
\|
*	Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'	Alyssa Ross	2022-01-07
\|
*	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 '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'	Alyssa Ross	2021-01-26
\|
*	Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'	Alyssa Ross	2021-01-15
\|
*	Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'	Alyssa Ross	2020-04-01
\|
*	Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'	Alyssa Ross	2020-01-11
\|
*	Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'	Alyssa Ross	2019-08-14
\|
*	Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'	Alyssa Ross	2019-08-14
\| \| \| \|	v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
*	Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'	Alyssa Ross	2019-06-18
\|
*	Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'	Alyssa Ross	2019-05-24
\|
*	Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'	Alyssa Ross	2019-03-11
\|
*	Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'	Alyssa Ross	2019-01-07
	git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199