From cddd16a0a8c715d160d82427f8b3f34e86edb563 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:30:44 +0800 Subject: [PATCH 1/9] pantheon.elementary-wallpapers: 6.0.0 -> 6.1.0 --- .../artwork/elementary-wallpapers/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 1ae25be5dcaf..debf7f0201a1 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -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}"; From 2eafe1f468653428824174379a38b3c4410c1ef7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:33:11 +0800 Subject: [PATCH 2/9] pantheon.elementary-screenshot: 6.0.1 -> 6.0.2 --- .../apps/elementary-screenshot/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index f2f4360aa59e..176c2919be04 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -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 = [ @@ -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"; From 80747a50f12553e8b988e9965c71feea0515bad7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:34:55 +0800 Subject: [PATCH 3/9] pantheon.elementary-calculator: 1.7.1 -> 1.7.2 --- .../apps/elementary-calculator/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 2878d750db8b..115622e81435 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -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 = [ @@ -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"; From 3aaf4a1dbb62319728c760b79bc4a0488c793279 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:36:18 +0800 Subject: [PATCH 4/9] pantheon.elementary-camera: 6.0.2 -> 6.0.3 --- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 0d434084c235..932b54e82b67 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -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 = [ From 2ce09af75c2e73f64f34b5e979b91ec23a1e1541 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:38:00 +0800 Subject: [PATCH 5/9] pantheon.switchboard-plug-onlineaccounts: 6.2.2 -> 6.3.0 --- .../apps/switchboard-plugs/onlineaccounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 409679407d81..46703b349e67 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -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 = [ From 7cd7809839cf39b5d0d7f189a99153fab203a9c9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:39:59 +0800 Subject: [PATCH 6/9] pantheon.elementary-tasks: 6.0.4 -> 6.1.0 --- .../apps/elementary-tasks/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 52bda92ceb0d..7ef0efaa49f1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -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 = [ @@ -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"; From 3977638aaac4114e5c2ff6aee7145dd9625d8249 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:41:38 +0800 Subject: [PATCH 7/9] pantheon.elementary-mail: 6.3.0 -> 6.3.1 --- .../pantheon/apps/elementary-mail/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 402612108b66..90058633e907 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -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 = [ @@ -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"; From 46605c63057f24b28065ef1e208ba457a1f029f0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:43:46 +0800 Subject: [PATCH 8/9] pantheon.elementary-terminal: 6.0.0 -> 6.0.1 --- .../apps/elementary-terminal/default.nix | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index f7799810ed81..4840f69e7cb4 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , pkg-config , meson , ninja @@ -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 = [ @@ -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 = '' From 836e8247fafa4e6448cb036cc3d013f518d2f08d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Dec 2021 09:48:52 +0800 Subject: [PATCH 9/9] pantheon.gala: clear indicator background for window switcher --- pkgs/desktops/pantheon/desktop/gala/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 06021a37f511..5a5af9ca5b98 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -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 = [