nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	Merge commit 'e3474e1d1e53'	Alyssa Ross	2024-02-26
\|
*	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 '6e3ee8957637a60f5072e33d78e05c0f65c54366'	Alyssa Ross	2022-03-19
\| \| \| \| \|	Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
*	Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'	Alyssa Ross	2022-01-07
\|
*	nixpkgs: merge nixos-unstable	Alyssa Ross	2021-02-16
\|
*	Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'	Alyssa Ross	2021-01-26
\|
*	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 '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'	Alyssa Ross	2020-04-27
\|
*	Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'	Alyssa Ross	2020-04-01
\|
*	Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'	Alyssa Ross	2019-08-14
\|
*	Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'	Alyssa Ross	2019-02-24