Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pantheon updates 2021-11-24 #147256

Merged
merged 4 commits into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-code/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@

stdenv.mkDerivation rec {
pname = "elementary-code";
version = "6.0.1";
version = "6.1.0";

repoName = "code";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d";
sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw=";
};

passthru = {
Expand Down
27 changes: 13 additions & 14 deletions pkgs/desktops/pantheon/desktop/gala/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,34 @@
, granite
, libgee
, bamf
, libcanberra
, libcanberra-gtk3
, gnome-desktop
, mutter
, clutter
, elementary-dock
, elementary-icon-theme
, elementary-settings-daemon
, gnome-settings-daemon
, wrapGAppsHook
, gexiv2
}:

stdenv.mkDerivation rec {
pname = "gala";
version = "6.2.1";
version = "6.3.0";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f";
sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw=";
};

patches = [
./plugins-dir.patch
# Multitasking view: Don't use smooth scroll events to handle mouse wheel
# Avoid breaking the multitasking view scroll once xf86-input-libinput 1.2.0 lands
# https://github.com/elementary/gala/pull/1266
# Session crashes when switching windows with Alt+Tab
# https://github.com/elementary/gala/issues/1312
(fetchpatch {
url = "https://github.com/elementary/gala/commit/d2dcfdefdf97c1b49654179a7acd01ebfe017308.patch";
sha256 = "sha256-2lKrCz3fSjrfKfysuUHzeUjhmMm84K47n882CLpfAyg=";
url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
})
];

Expand All @@ -66,20 +62,23 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
clutter
elementary-dock
elementary-icon-theme
elementary-settings-daemon
gnome-settings-daemon
gexiv2
gnome-desktop
granite
gtk3
libcanberra
libcanberra-gtk3
libgee
mutter
];

mesonFlags = [
# TODO: enable this and remove --builtin flag from session-settings
# https://github.com/NixOS/nixpkgs/pull/140429
"-Dsystemd=false"
];

postPatch = ''
chmod +x build-aux/meson/post_install.py
patchShebangs build-aux/meson/post_install.py
Expand All @@ -91,7 +90,7 @@ stdenv.mkDerivation rec {
};
};

meta = with lib; {
meta = with lib; {
description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon";
homepage = "https://github.com/elementary/gala";
license = licenses.gpl3Plus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@

stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.9.1";
version = "2.10.1";

repoName = "applications-menu";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-Q0ee8S8wWhK0Y16SWfE79Us6QD/oRE5Pxm3o//eb/po=";
sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o=";
};

patches = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pantheon
Expand Down Expand Up @@ -40,7 +41,10 @@ stdenv.mkDerivation rec {
})
# Fix incorrect month shown on re-opening indicator if previously changed month
# https://github.com/elementary/wingpanel-indicator-datetime/pull/284
./fix-incorrect-month.patch
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch";
sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4=";
})
];

nativeBuildInputs = [
Expand Down

This file was deleted.