about summary refs log tree commit diff
path: root/nixpkgs/pkgs/top-level
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'Alyssa Ross2024-05-07
| | | | | | | 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 'd8fe5e6c'Alyssa Ross2024-04-10
| | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-03-24
|
* Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'Alyssa Ross2024-03-22
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-03-01
|
* Merge nixos-unstable-small and nixos-apple-siliconAlyssa Ross2024-02-27
|
* Merge commit 'e3474e1d1e53'Alyssa Ross2024-02-26
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-02-20
|
* 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 Ross2024-01-20
| | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-01-10
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-01-07
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2024-01-06
| | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-17
|
* 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-12-07
|
* Merge https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-01
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-11-20
|
* Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into ↵Alyssa Ross2023-11-19
| | | | HEAD
* perlPackages: move closer to upstreamAlyssa Ross2023-11-19
| | | | This will avoid future merge conflicts.
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEADAlyssa Ross2023-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 Ross2023-11-16
| | | | HEAD
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEADAlyssa Ross2023-11-05
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEADAlyssa Ross2023-11-05
| | | | | Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix
* Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEADAlyssa Ross2023-10-31
|
* Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEADAlyssa Ross2023-10-30
| | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
* Merge commit 'a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb'Alyssa Ross2023-10-22
|
* Merge commit '8dfad603247387df1df4826b8bea58efc5d012d8'Alyssa Ross2023-10-22
|
* Merge commit '83b8726e5f6f85a28405c7772f75093fd9a399a3'Alyssa Ross2023-10-21
|
* Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'Alyssa Ross2023-10-20
| | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
* Merge branch 'staging' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-22
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-16
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-15
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-14
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-12
|
* Merge https://github.com/NixOS/nixpkgsAlyssa Ross2023-09-01
|
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-08-26
| | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix
* perlPackages.HTTPDaemon: remove duplicate inputAlyssa Ross2023-08-26
| | | | In Perl packages, buildInputs seems to be used for checkInputs.
* 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-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
* 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
* Revert "firefox-beta: init at 65.0b12"Alyssa Ross2023-06-14
| | | | | | This reverts commit e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf. I don't use this, and it's not worth the merge conflicts.
* python3Packages: remove unused bindingAlyssa Ross2023-06-06
|
* ruby: remove old versionsAlyssa Ross2023-06-05
|
* 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
* irccat: init at 0.4.8Alyssa Ross2022-03-30
| | | | (cherry picked from commit ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510)
* cgit-pink: init at 1.3.0Alyssa Ross2022-03-30
| | | | | | | | | | | | | | cgit-pink is a fork of cgit that aims to be better maintained, because cgit doesn't get a lot of attention any more, and almost every patch sent in the last couple of years has been ignored. The build system is exactly the same as cgit's, so I've created a common cgit builder function. This way, improvements to cgit packaging (I've already noticed a couple to make!) can be shared between both packages. If the build systems diverge, we can separate them out in future. (cherry picked from commit deab83e11674f1cfbc9d5e5626d12ed9344d8091)
* Merge commit '6e3ee8957637a60f5072e33d78e05c0f65c54366'Alyssa Ross2022-03-19
| | | | | Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
* ccsymbols: init at 2020-04-19Alyssa Ross2022-03-17
|
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-28 09:25:36 +0000