about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/gnutls
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 'a343533bccc62400e8a9560423486a3b6c11a23b'Alyssa Ross2024-03-22
|
* Merge commit 'e3474e1d1e53'Alyssa Ross2024-02-26
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-02-13
| | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-15
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-08-26
| | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/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 '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 '3a8d7958a610cd3fec3a6f424480f91a1b259185'Alyssa Ross2021-06-30
|
* Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'Alyssa Ross2021-06-23
| | | | | # Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
* Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'Alyssa Ross2021-06-10
|
* 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 '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 '683c68232e91f76386db979c461d8fbe2a018782'Alyssa Ross2020-05-12
|
* Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'Alyssa Ross2020-04-27
|
* Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'Alyssa Ross2020-04-01
|
* Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'Alyssa Ross2020-01-11
|
* Merge remote-tracking branch 'channels/nixos-unstable'Alyssa Ross2019-08-22
|
* Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'Alyssa Ross2019-06-18
|
* Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'Alyssa Ross2019-05-24
|
* Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'Alyssa Ross2019-04-22
|
* 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-16 14:08:20 +0000