about summary refs log tree commit diff
path: root/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin
Commit message (Collapse)AuthorAge
* Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'Alyssa Ross2021-06-23
| | | | | # Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
* 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
* Merge remote-tracking branch 'nixpkgs/nixos-unstable'Alyssa Ross2021-04-12
|
* nixpkgs: merge nixos-unstableAlyssa Ross2021-02-16