about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/harfbuzz
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'Alyssa Ross8 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 branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-03-24
|
* Merge commit 'e3474e1d1e53'Alyssa Ross2024-02-26
|
* 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 branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵Alyssa Ross2023-11-16
| | | | HEAD
* Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'Alyssa Ross2023-10-20
| | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-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 '99665eb45f58d959d2cb9e49ddb960c79d596f33'Alyssa Ross2023-02-08
|
* Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'Alyssa Ross2022-03-31
| | | | | | | | | | Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
* Merge commit '6e3ee8957637a60f5072e33d78e05c0f65c54366'Alyssa Ross2022-03-19
| | | | | Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
* Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'Alyssa Ross2022-03-11
| | | | | | | | | | Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
* 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
* Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'Alyssa Ross2021-09-27
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
* Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'Alyssa Ross2021-09-13
|
* Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'Alyssa Ross2021-06-30
|
* Merge remote-tracking branch 'nixpkgs/nixos-unstable'Alyssa Ross2021-04-12
|
* Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'Alyssa Ross2021-01-26
|
* Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'Alyssa Ross2021-01-15
|
* Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'Alyssa Ross2021-01-12
|
* Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'Alyssa Ross2020-04-27
|
* Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'Alyssa Ross2020-01-11
|
* Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'Alyssa Ross2019-09-28
|
* Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'Alyssa Ross2019-09-16
|
* Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'Alyssa Ross2019-08-14
|
* Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'Alyssa Ross2019-06-18
|
* Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'Alyssa Ross2019-02-26
|
* Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'Alyssa Ross2019-02-24
|
* Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'Alyssa Ross2019-02-07
|
* Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'Alyssa Ross2019-01-07
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-15 04:17:28 +0000