about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libzapojit
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'Alyssa Ross9 days
| | | | | | | 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 '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 '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'Alyssa Ross2021-01-26
|
* Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'Alyssa Ross2020-04-27
|
* Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'Alyssa Ross2019-09-16
|
* Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'Alyssa Ross2019-02-07