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-12-13 #150627

Merged
merged 9 commits into from
Dec 14, 2021
Merged

Pantheon updates 2021-12-13 #150627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cddd16a
pantheon.elementary-wallpapers: 6.0.0 -> 6.1.0
bobby285271 Dec 14, 2021
2eafe1f
pantheon.elementary-screenshot: 6.0.1 -> 6.0.2
bobby285271 Dec 14, 2021
80747a5
pantheon.elementary-calculator: 1.7.1 -> 1.7.2
bobby285271 Dec 14, 2021
3aaf4a1
pantheon.elementary-camera: 6.0.2 -> 6.0.3
bobby285271 Dec 14, 2021
2ce09af
pantheon.switchboard-plug-onlineaccounts: 6.2.2 -> 6.3.0
bobby285271 Dec 14, 2021
7cd7809
pantheon.elementary-tasks: 6.0.4 -> 6.1.0
bobby285271 Dec 14, 2021
3977638
pantheon.elementary-mail: 6.3.0 -> 6.3.1
bobby285271 Dec 14, 2021
46605c6
pantheon.elementary-terminal: 6.0.0 -> 6.0.1
bobby285271 Dec 14, 2021
836e824
pantheon.gala: clear indicator background for window switcher
bobby285271 Dec 14, 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
20 changes: 9 additions & 11 deletions pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,13 @@

stdenv.mkDerivation rec {
pname = "elementary-calculator";
version = "1.7.1";

repoName = "calculator";
version = "1.7.2";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "calculator";
rev = version;
sha256 = "sha256-GoQFWhEhUBVLYL1vsIIBMT8pKc0dK/ploiGfUtJAJQU=";
};

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-U0wXrw9ZJwkqZAtTTHmTzqYhwF9V2JZEZZdDak3kPIc=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -63,6 +55,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};

meta = with lib; {
homepage = "https://github.com/elementary/calculator";
description = "Calculator app designed for elementary OS";
Expand Down
8 changes: 3 additions & 5 deletions pkgs/desktops/pantheon/apps/elementary-camera/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@

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

repoName = "camera";
version = "6.0.3";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "camera";
rev = version;
sha256 = "sha256-uVeV+LKA/W7WVUAvVWaSNRzeh1MUrhRjvS0HuhZZJ04=";
sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w=";
};

nativeBuildInputs = [
Expand Down
20 changes: 9 additions & 11 deletions pkgs/desktops/pantheon/apps/elementary-mail/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,13 @@

stdenv.mkDerivation rec {
pname = "elementary-mail";
version = "6.3.0";

repoName = "mail";
version = "6.3.1";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "mail";
rev = version;
sha256 = "sha256-lIVAMTtRrzJI5Qcd6y24ZmtzFWeTSbcKiEhG8hLC+PM=";
};

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -72,6 +64,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};

meta = with lib; {
description = "Mail app designed for elementary OS";
homepage = "https://github.com/elementary/mail";
Expand Down
20 changes: 9 additions & 11 deletions pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,13 @@

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

repoName = "screenshot";
version = "6.0.2";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "screenshot";
rev = version;
sha256 = "sha256-MDmk+0IUCe6PSV5QOjjDRedv7X3lcBJ04jn9cE9DP3M=";
};

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw=";
};

nativeBuildInputs = [
Expand All @@ -60,6 +52,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};

meta = with lib; {
description = "Screenshot tool designed for elementary OS";
homepage = "https://github.com/elementary/screenshot";
Expand Down
20 changes: 9 additions & 11 deletions pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,13 @@

stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.0.4";

repoName = "tasks";
version = "6.1.0";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "tasks";
rev = version;
sha256 = "1gb51gm8qgd8yzhqb7v69p2f1fgm3qf534if4lc85jrjsb8hgmhl";
};

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-Gt9Hp9m28QdAFnKIT1xcbiSM5cn6kW7wEXmi/iFfu8k=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -74,6 +66,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};

meta = with lib; {
homepage = "https://github.com/elementary/tasks";
description = "Synced tasks and reminders on elementary OS";
Expand Down
30 changes: 9 additions & 21 deletions pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, pkg-config
, meson
, ninja
Expand All @@ -24,30 +23,13 @@

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

repoName = "terminal";
version = "6.0.1";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "terminal";
rev = version;
sha256 = "08akr4sv4jy9kd4s26kib6j7i8hc3vs0sp71fifv7ww4mi9cm6jc";
};

patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/terminal/pull/611
(fetchpatch {
url = "https://github.com/elementary/terminal/commit/4f6f2d9f58642ed904240c247cc0a0846baecb6b.patch";
sha256 = "04pbd72migxw8i949v3bmw8kfi5nr02rjcwfrx3b6xkiic9825sv";
})
];

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -81,6 +63,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};

meta = with lib; {
description = "Terminal emulator designed for elementary OS";
longDescription = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
version = "6.2.2";
version = "6.3.0";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM=";
sha256 = "sha256-aRh2zbKqcGOH4Qw5gdJw07hod8a/QGWUcJo/2R9erQs=";
};

nativeBuildInputs = [
Expand Down
17 changes: 11 additions & 6 deletions pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,35 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, gettext
, meson
, ninja
, gettext
, python3
}:

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

repoName = "wallpapers";
version = "6.1.0";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "wallpapers";
rev = version;
sha256 = "1qpf8w7x9sp3sd4zpsrlj5ywpwqkq4ywbagm4sf25cwwn82dl59b";
sha256 = "sha256-E/cUxa/GNt/01EjuuvurHxJu3qV9e+jcdcCi2+NxVDA=";
};

nativeBuildInputs = [
gettext
meson
ninja
python3
];

postPatch = ''
chmod +x meson/symlink.py
patchShebangs meson/symlink.py
'';

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
Expand Down
6 changes: 6 additions & 0 deletions pkgs/desktops/pantheon/desktop/gala/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
})
# WindowSwitcher: Clear indicator background
# https://github.com/elementary/gala/pull/1318
(fetchpatch {
url = "https://github.com/elementary/gala/commit/cce53acffecba795b6cc48916d4621a47996d2c9.patch";
sha256 = "sha256-5aTZE6poo4sQMTLfk9Nhw4G4BW8i9dvpWktizRIS58Q=";
})
];

nativeBuildInputs = [
Expand Down