about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications
Commit message (Collapse)AuthorAge
* 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
* 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
* 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.
* dino: 0.3.1 -> 0.3.2Alyssa Ross2023-06-05
| | | | | Fixes: CVE-2023-28686 (cherry picked from commit 81192e2b927f13e8ec70c210682a545363a31e90)
* dino: 0.3.0 -> 0.3.1clerie2023-06-05
| | | | (cherry picked from commit bfc4a9d9d33d44f7d183553be8e1712917f1213b)
* 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
* 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
* firefox: 97.0.2 -> 98.0Martin Weinelt2022-03-17
| | | | | https://www.mozilla.org/en-US/firefox/98.0/releasenotes/ (cherry picked from commit 7e5b346bd4fc80063d743e076b705e40c2387482)
* Merge commit '3239fd2b8f728106491154b44625662e10259af2'Alyssa Ross2022-03-16
| | | | | Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.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
* emacs packages: machine+hand updated at 2022-02-17AndersonTorres2022-02-21
| | | | (cherry picked from commit 1dc68f203cc0d495dcd271d973590511adb1aaa6)
* melpa-packages 2022-02-06AndersonTorres2022-02-21
| | | | (cherry picked from commit 88a7c0e327772fbac71e5c67d3fbad6b8709d092)
* emacs.pkgs.melpa*: 2022-01-20Albin Otterhäll2022-02-21
| | | | (cherry picked from commit 2222e9b3f3892554a11910732bc2e73eee6d4dc5)
* melpa-packages 2022-01-08AndersonTorres2022-02-21
| | | | (cherry picked from commit 0a0c1140dc3ca394e29033d059d7c18fd4bdfd7d)
* nongnu-packages 2022-02-06AndersonTorres2022-02-21
| | | | (cherry picked from commit 12b90a49fb708bacc883a839db9d449c8c97813e)
* emacs.pkgs.nongnu: 2022-01-20Albin Otterhäll2022-02-21
| | | | (cherry picked from commit ee226b91dd32c1eedce8c30e9e63d443bbfd6f18)
* nongnu-packages 2022-01-08AndersonTorres2022-02-21
| | | | (cherry picked from commit c1b06381d8a742d9a6214018399b56f443d0717e)
* pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix: manual fixupAndersonTorres2022-02-21
| | | | (cherry picked from commit eca8a5d6941626d43e05d73635e915a0d3f482ce)
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-12 17:11:30 +0000