about summary refs log tree commit diff
path: root/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
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 https://github.com/NixOS/nixpkgsAlyssa Ross2023-12-01
|
* 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/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
* 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 '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
* 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 'a323570a264da96a0b0bcc1c9aa017794acdc752'Alyssa Ross2022-01-07
|
* 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 '432fc2d9a67f92e05438dff5fdc2b39d33f77997'Alyssa Ross2021-06-22
| | | | | | | | | # Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
* nixpkgs: merge nixos-unstableAlyssa Ross2021-02-16
|
* Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'Alyssa Ross2021-01-15
|
* Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'Alyssa Ross2021-01-12
|
* 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 commit '262b328b0bad0c4b97ed495679208e4a2eb87704'Alyssa Ross2019-09-28
|
* Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'Alyssa Ross2019-09-16
|
* Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'Alyssa Ross2019-09-16
|
* Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'Alyssa Ross2019-09-16
|
* Merge remote-tracking branch 'channels/nixos-unstable'Alyssa Ross2019-08-22
|
* Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'Alyssa Ross2019-08-14
|
* Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'Alyssa Ross2019-06-18
|
* Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'Alyssa Ross2019-05-24
|
* Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'Alyssa Ross2019-04-22
|
* Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'Alyssa Ross2019-04-14
|
* Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'Alyssa Ross2019-03-16
|
* Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'Alyssa Ross2019-03-11
|
* Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'Alyssa Ross2019-02-24
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-02 12:22:29 +0000