BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #143922 from bobby285271/pantheon

Browse source 
Pantheon updates 2021-10-30
This commit is contained in:
Bobby Rong 2021-10-31 12:34:32 +08:00 committed by GitHub
commit 674a31bd4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, pkg-config
@ -12,6 +12,7 @@
, gtk3
, granite
, libgee
, libhandy
, clutter-gst
, clutter-gtk
, gst_all_1
@ -21,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.7.3";
version = "2.8.0";
repoName = "videos";
@ -29,22 +30,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/videos/pull/233
(fetchpatch {
url = "https://github.com/elementary/videos/commit/19ba2a9148be09ea521d2e9ac29dede6b9c6fa07.patch";
sha256 = "0ffp7ana98846xi7vxrzfg6dbs4yy28x2i4ky85mqs1gj6fjqin5";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-FFCtQ42LygfjowehwZcISWTfv8PBZTH0X8mPrpiG8Ug=";
};
nativeBuildInputs = [
@ -70,6 +56,7 @@ stdenv.mkDerivation rec {
gstreamer
gtk3
libgee
libhandy
];
postPatch = ''
@ -77,6 +64,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Video player and library app designed for elementary OS";
homepage = "https://github.com/elementary/videos";

14
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, meson
@ -17,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "elementary-default-settings";
version = "6.0.1";
version = "6.0.2";
repoName = "default-settings";
@ -25,18 +24,9 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0gqnrm968j4v699yhhiyw5fqjy4zbvvrjci2v1jrlycn09c2yrwf";
sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y=";
};
patches = [
# Update gtk-theme-name and gtk-font-name for Pantheon 6
# https://github.com/elementary/default-settings/pull/252
(fetchpatch {
url = "https://github.com/elementary/default-settings/commit/be24c151492bb9115c75bd1a7abc88714240294a.patch";
sha256 = "sha256-EglFiN4CLbL8osfNGLvjD220Al35uBXuRNC9Ud3QYBI=";
})
];
nativeBuildInputs = [
accountsservice
dbus

41
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pantheon
@ -24,20 +24,24 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1mdm0fsnmmyw8c0ik2jmfri3kas9zkz1hskzf8wvbd51vnazfpgw";
sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
elementary_calendar = elementary-calendar;
})
# 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
];
nativeBuildInputs = [
libxml2
@ -60,24 +64,17 @@ stdenv.mkDerivation rec {
libgdata # required by some dependency transitively
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
elementary_calendar = elementary-calendar;
})
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-datetime/pull/269
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/f7befa68a9fd6215297c334a366919d3431cae65.patch";
sha256 = "0l997b1pnpjscs886xy28as5yykxamxacvxdv8466zin7zynarfs";
})
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Date & Time Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-datetime";

26
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch Normal file
View file

@ -0,0 +1,26 @@
From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001
From: Jeremy Paul Wootten <jeremywootten@gmail.com>
Date: Sat, 30 Oct 2021 17:44:12 +0100
Subject: [PATCH] Reset position and relative position after rebuilding
carousel
---
src/Widgets/calendar/CalendarView.vala | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
index a41b37a4..f946b91c 100644
--- a/src/Widgets/calendar/CalendarView.vala
+++ b/src/Widgets/calendar/CalendarView.vala
@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
carousel.add (right_grid);
carousel.scroll_to (start_month_grid);
label.label = calmodel.month_start.format (_("%OB, %Y"));
+
+ position = 1;
+ rel_postion = 0;
}
+
carousel.no_show_all = false;
}