about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/interpreters/python/sitecustomize.py
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'Alyssa Ross2024-05-07
| | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
* Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'Alyssa Ross2020-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 Ross2020-04-27
|
* Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'Alyssa Ross2019-08-14