about summary refs log tree commit diff
path: root/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix
Commit message (Collapse)AuthorAge
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-01-20
| | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
* Merge https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-01
|
* Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44'Alyssa Ross2021-07-23
|
* Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'Alyssa Ross2021-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 '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 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'Alyssa Ross2020-04-01
|
* Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'Alyssa Ross2020-01-11