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.

Sign up for GitHub

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-09-22 #139057

Merged
merged 6 commits into from
Sep 23, 2021
Merged

Pantheon updates 2021-09-22 #139057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4788070
pantheon.epiphany: remove fixme
bobby285271 Sep 23, 2021
8ffb817
pantheon.sideload: 6.0.1 -> 6.0.2
bobby285271 Sep 23, 2021
ab0b955
pantheon.elementary-greeter: 6.0.0 -> 6.0.1
bobby285271 Sep 23, 2021
3984a18
pantheon.elementary-calendar: 6.0.1 -> 6.0.2
bobby285271 Sep 23, 2021
6c6ad98
pantheon.switchboard-plug-keyboard: 2.5.0 -> 2.5.1
bobby285271 Sep 23, 2021
6632bec
pantheon.switchboard-plug-mouse-touchpad: 6.0.0 -> 6.1.0
bobby285271 Sep 23, 2021
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
1 change: 0 additions & 1 deletion pkgs/desktops/gnome/core/epiphany/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ stdenv.mkDerivation rec {

patches = lib.optionals withPantheon [
# https://github.com/elementary/browser
# FIXME: Update the patches when https://github.com/elementary/browser/pull/41 merged
./dark-style.patch
./navigation-buttons.patch
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@

stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "6.0.1";
version = "6.0.2";

repoName = "calendar";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1caxc42jrys5s4x9qai5wdpcwpkmyvnqx9z75974g7swiz1lrzq6";
sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514";
};

passthru = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/sideload/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@

stdenv.mkDerivation rec {
pname = "sideload";
version = "6.0.1";
version = "6.0.2";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0mwcaayzcm5pjcwdd61can93y66jiz4wyz9wr8j5fbns5hbk3z5m";
sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9";
};

passthru = {
Expand Down
10 changes: 2 additions & 8 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,16 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
version = "2.5.0";
version = "2.5.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1nsy9fh6qj5kyg22bs1hm6kpsvarwc63q0hl0nbwymvnhfjf6swp";
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y";
};

patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-keyboard/pull/377
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6d8bcadba05b4ee1115b891448b0de31bcba3749.patch";
sha256 = "1bppxakj71r3cfy8sw19xbyngb7r6nyirc4g6pjf02cdidhw3v8l";
})
./0001-Remove-Install-Unlisted-Engines-function.patch
(substituteAll {
src = ./fix-paths.patch;
Expand Down
10 changes: 2 additions & 8 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "6.0.0";
version = "6.1.0";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "19kiwrdpan8hr5r79y591591qjx7pm3x814xfkg9vi11ndbcrznr";
sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5";
};

passthru = {
Expand Down Expand Up @@ -60,12 +60,6 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
touchegg = touchegg;
})
# Upstream code not respecting our localedir
# https://github.com/elementary/switchboard-plug-mouse-touchpad/pull/185
(fetchpatch {
bobby285271 marked this conversation as resolved.
Show resolved Hide resolved
url = "https://github.com/elementary/switchboard-plug-mouse-touchpad/commit/a6f84dc08be5dc6f7535082bacfa24e2dff4ef67.patch";
sha256 = "0fxl894dzw1f84n36mb9y7gshs69xcb0samvs2gsa0pcdlzfp3cy";
})
];

meta = with lib; {
Expand Down
10 changes: 2 additions & 8 deletions pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@

stdenv.mkDerivation rec {
pname = "elementary-greeter";
version = "6.0.0";
version = "6.0.1";

repoName = "greeter";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1ny1003bbpdscc4kr2d94zc5vxm30y64dpj3fpd5zz2p2g0cq2h9";
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
};

passthru = {
Expand Down Expand Up @@ -89,12 +89,6 @@ stdenv.mkDerivation rec {
];

patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/greeter/pull/545
(fetchpatch {
bobby285271 marked this conversation as resolved.
Show resolved Hide resolved
url = "https://github.com/elementary/greeter/commit/d1373a7db827bc753bfcd70d0c8f25460ea9f1de.patch";
sha256 = "0s8l7ycd2s307d3dh1p4vdk33dbzjzqwxs6msyb9w0ycfyxlwdvp";
})
./sysconfdir-install.patch
# Needed until https://github.com/elementary/greeter/issues/360 is fixed
(substituteAll {
Expand Down