diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-19 17:15:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-02-19 17:15:31 +0100 |
| commit | 8f50f1ce107914ae5a07bd9aff6649021deb6fca (patch) | |
| tree | 12a65659f7a05af761500651b5260b34eea6abab /pkgs/desktops | |
| parent | c34b032ccb5cb1cf282ed141d7f60420879e2b42 (diff) | |
| parent | e4f96ad7d9fa4ff2ada4936cab6abaa8b0e823c0 (diff) | |
| download | nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.gz nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.bz2 nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.lz nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.xz nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.zst nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.zip | |
Merge branch 'staging-next' into staging
Resolved the following conflicts: - kernel flags between 09176d28a0ebbd8bae35f92406a48cded78ac9f7 and 2b28822d8dec38fd62ef17643ec71da3bb488619 - clojure-lsp between 3fa00685ce21fb1a4218d444d0862ebcb2b99706 and e03c068af5c9ca950214cd6c3b5cfe67f595da88
Diffstat (limited to 'pkgs/desktops')
6 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 80a026e8836..0e8f6dbf8c3 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -11,18 +11,10 @@ , intltool , libxslt , gtk3 -, libnotify -, libxkbfile -, cinnamon-menus , libgnomekbd -, libxklavier -, networkmanager -, libwacom , gnome3 , libtool , wrapGAppsHook -, tzdata -, glibc , gobject-introspection , python3 , pam diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 3a7e21c65f5..ef5e564beb9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,7 +2,6 @@ , gettext , fetchurl , evolution-data-server -, fetchpatch , pkg-config , libxslt , docbook_xsl diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5a78f412dc7..98d87dc09c8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -22,7 +22,6 @@ , gnome-color-manager , gnome-desktop , gnome-online-accounts -, gnome-session , gnome-settings-daemon , gnome3 , grilo diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 002ae9197b7..d2909c449d4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -30,7 +30,6 @@ , systemd , libnma , tzdata -, yelp , libgnomekbd , gsettings-desktop-schemas , gnome-tour diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 1f9b1ba871d..1947179028b 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -16,7 +16,6 @@ , adwaita-icon-theme , libgweather , gucharmap -, tracker , polkit , gnome3 }: diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 27a379f4738..e45d25cfa34 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -11,7 +11,6 @@ , wingpanel , orca , onboard -, at-spi2-core , elementary-default-settings , elementary-settings-daemon , runtimeShell |