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-23 #139163

Merged
merged 6 commits into from
Sep 24, 2021
Merged

Pantheon updates 2021-09-23 #139163

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
fa24e51
pantheon.switchboard-plug-keyboard: remove fetchpatch from input
bobby285271 Sep 23, 2021
3c6559d
panthoen.elementary-greeter: remove fetchpatch from input
bobby285271 Sep 23, 2021
cc88754
pantheon.switchboard-plug-mouse-touchpad: remove fetchpatch from input
bobby285271 Sep 23, 2021
220f157
pantheon.wingpanel-indicator-sound: pin vala version
bobby285271 Sep 23, 2021
7dd555c
pantheon.gala: 6.0.1 -> 6.2.0
bobby285271 Sep 24, 2021
6adf8ac
pantheon.elementary-photos: 2.7.1 -> 2.7.2
bobby285271 Sep 24, 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: 6 additions & 14 deletions pkgs/desktops/pantheon/apps/elementary-photos/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
, ninja
, pkg-config
, vala
, vala_0_52
, desktop-file-utils
, gtk3
, libaccounts-glib
Expand Down Expand Up @@ -35,26 +34,17 @@

stdenv.mkDerivation rec {
pname = "elementary-photos";
version = "2.7.1";
version = "2.7.2";

repoName = "photos";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p";
sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc";
};

patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/photos/pull/629
(fetchpatch {
url = "https://github.com/elementary/photos/commit/e5230a4305381734e93f1e3d1177da21a8a4121b.patch";
sha256 = "1igqq51sj1sx6rl8yrw037jsgnaxfwzfs0m6pqzb9q4jvfdimzfi";
})
];

passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
Expand All @@ -68,7 +58,9 @@ stdenv.mkDerivation rec {
ninja
pkg-config
python3
vala
# Does not build with vala 0.54
# https://github.com/elementary/photos/issues/638
vala_0_52
wrapGAppsHook
];

Expand Down
1 change: 0 additions & 1 deletion 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 @@ -2,7 +2,6 @@
, fetchFromGitHub
, nix-update-script
, pantheon
, fetchpatch
, substituteAll
, meson
, ninja
Expand Down
1 change: 0 additions & 1 deletion 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
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pantheon
Expand Down
1 change: 0 additions & 1 deletion pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, linkFarm
, substituteAll
Expand Down
11 changes: 2 additions & 9 deletions pkgs/desktops/pantheon/desktop/gala/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, pantheon
, pkg-config
, meson
Expand Down Expand Up @@ -30,13 +29,13 @@

stdenv.mkDerivation rec {
pname = "gala";
version = "6.0.1";
version = "6.2.0";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0xp9vviamzdwlcnx4836sxaz2pyfkxswgvjm73ppn7fkdm0zjpzx";
sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g";
};

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

patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/gala/pull/1205
(fetchpatch {
url = "https://github.com/elementary/gala/commit/605aa10ea2a78650e001b2a247c5f7afce478b05.patch";
sha256 = "0bg67wzrnmx8nlw93i35vhyfx8al0bj0lacgci98vwlp2m1jgbd2";
})
./plugins-dir.patch
];

Expand Down
6 changes: 4 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
, meson
, python3
, ninja
, vala
, vala_0_52
, gtk3
, granite
, wingpanel
Expand Down Expand Up @@ -50,7 +50,9 @@ stdenv.mkDerivation rec {
ninja
pkg-config
python3
vala
# Does not build with vala 0.54
# https://github.com/elementary/wingpanel-indicator-sound/issues/219
vala_0_52
];

buildInputs = [
Expand Down