Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit 'd8fe5e6c' | Alyssa Ross | 2024-04-10 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
* | Drop mdDoc | Alyssa Ross | 2024-04-05 |
| | | | | This is being removed in Nixpkgs. | ||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-03-24 |
| | |||
* | Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b' | Alyssa Ross | 2024-03-22 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-03-01 |
| | |||
* | Merge nixos-unstable-small and nixos-apple-silicon | Alyssa Ross | 2024-02-27 |
| | |||
* | Merge commit 'e3474e1d1e53' | Alyssa Ross | 2024-02-26 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-20 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-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/nixpkgs | Alyssa Ross | 2024-01-20 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-10 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-07 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-06 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
* | postfix: 3.8.3 -> 3.8.4 | Alvar Penning | 2023-12-25 |
| | | | | | | | | | | | | | Security: this release adds support to defend against an email spoofing attack (SMTP smuggling) on recipients at a Postfix server. For background, see https://www.postfix.org/smtp-smuggling.html. https://www.postfix.org/announcements/postfix-3.8.4.html The source URL was modified to another mirror as the current CDN URL failed to resolve for me from two different hosts. (cherry picked from commit 5324b5601034d7d2090c4acdcddf1bdf08c25a73) | ||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-17 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-15 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-07 |
| | |||
* | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-01 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-11-20 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵ | Alyssa Ross | 2023-11-19 |
| | | | | HEAD | ||
* | perlPackages: move closer to upstream | Alyssa Ross | 2023-11-19 |
| | | | | This will avoid future merge conflicts. | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-19 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/top-level/perl-packages.nix | ||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵ | Alyssa Ross | 2023-11-16 |
| | | | | HEAD | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-05 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-05 |
| | | | | | Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix | ||
* | Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD | Alyssa Ross | 2023-10-31 |
| | |||
* | Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD | Alyssa Ross | 2023-10-30 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
* | Merge commit 'a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb' | Alyssa Ross | 2023-10-22 |
| | |||
* | Merge commit '8dfad603247387df1df4826b8bea58efc5d012d8' | Alyssa Ross | 2023-10-22 |
| | |||
* | Merge commit '83b8726e5f6f85a28405c7772f75093fd9a399a3' | Alyssa Ross | 2023-10-21 |
| | |||
* | Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8' | Alyssa Ross | 2023-10-20 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
* | Merge branch 'staging' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-22 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-16 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-15 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-14 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-12 |
| | |||
* | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-01 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-08-26 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
* | perlPackages.HTTPDaemon: remove duplicate input | Alyssa Ross | 2023-08-26 |
| | | | | In Perl packages, buildInputs seems to be used for checkInputs. | ||
* | authheaders: add setuptools dependency | Alyssa Ross | 2023-08-26 |
| | | | | | | | | | | | > File "/nix/store/4yshsw9xkwfw8ybn7xsr9kg2a5dynawd-python3-3.10.12-env/lib/python3.10/site-packages/authheaders/dmarc_lookup.py", line 22, in <module> > from pkg_resources import resource_filename # Part of setuptools This was previously propagated from gunicorn, but gunicorn no longer depends on setuptools. Fixes the Mailman NixOS test. Fixes: 2b8a7515d884 ("python3.pkgs.gunicorn: replace setuptools with packaging dependency") (cherry picked from commit 542639f95a3646277beb848bb68aa91c30492c86) | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-08-26 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix | ||
* | nixos: use mdDoc | Alyssa Ross | 2023-08-16 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-08-13 |
| | | | | | | | | | | | Conflicts: 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/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391 | ||
* | mailman: remove no-base64.diff | Alyssa Ross | 2023-08-08 |
| | | | | | | I sent an email contaning an em dash to a mailing list, and it didn't get converted to base64, so I don't think this patch is required any more. | ||
* | mesa: 23.1.1 -> 23.1.2 | Vladimír Čunát | 2023-08-05 |
| | | | | | https://docs.mesa3d.org/relnotes/23.1.2.html#bug-fixes (cherry picked from commit 2931f3b2f7d727e1e9657a63a3293b445b9aeba6) | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-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 | ||
* | Revert "firefox-beta: init at 65.0b12" | Alyssa Ross | 2023-06-14 |
| | | | | | | This reverts commit e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf. I don't use this, and it's not worth the merge conflicts. | ||
* | python3Packages: remove unused binding | Alyssa Ross | 2023-06-06 |
| | |||
* | cairo: drop modifications | Alyssa Ross | 2023-06-06 |
| | | | | | I don't need to disable any Cairo features, and upstream is switching to Meson, so won't be interested in these patches. | ||
* | ruby: remove old versions | Alyssa Ross | 2023-06-05 |
| |