nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'	Alyssa Ross	2024-03-22
\|
*	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 '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 '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'	Alyssa Ross	2021-01-12
\|
*	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 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'	Alyssa Ross	2020-04-01
\|
*	Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'	Alyssa Ross	2020-01-11
\|
*	Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'	Alyssa Ross	2019-09-16
\|
*	Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'	Alyssa Ross	2019-09-16
\|
*	Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'	Alyssa Ross	2019-06-18
\|
*	Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'	Alyssa Ross	2019-04-22
\|
*	Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'	Alyssa Ross	2019-02-18
\|
*	Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'	Alyssa Ross	2019-01-07
	git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199