about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cpptoml
Commit message (Collapse)AuthorAge
* Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'Alyssa Ross2023-02-08
|
* Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'Alyssa Ross2022-02-19
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix