nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs	Alyssa Ross	2024-03-24
\|
*	Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'	Alyssa Ross	2023-10-20
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
*	Merge branch 'staging' of https://github.com/NixOS/nixpkgs	Alyssa Ross	2023-09-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 '6e3ee8957637a60f5072e33d78e05c0f65c54366'	Alyssa Ross	2022-03-19
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/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 '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'	Alyssa Ross	2021-01-26
\|
*	Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'	Alyssa Ross	2020-04-27
\|
*	Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'	Alyssa Ross	2020-01-11
\|
*	Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'	Alyssa Ross	2019-05-07
\|
*	Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'	Alyssa Ross	2019-03-11
\|
*	Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'	Alyssa Ross	2019-02-24
\|
*	Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'	Alyssa Ross	2019-01-07
	git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199