mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge staging-next-21.11 into staging-21.11
This commit is contained in:
github-actions[bot]
@@ -224,7 +224,6 @@ in
|
||||
programs.file-roller.package = pkgs.pantheon.file-roller;
|
||||
|
||||
# Settings from elementary-default-settings
|
||||
environment.sessionVariables.GTK_CSD = "1";
|
||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||
|
||||
xdg.portal.extraPortals = with pkgs; [
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "98.0.4758.102",
|
||||
"sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1",
|
||||
"sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6",
|
||||
"version": "99.0.4844.51",
|
||||
"sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
|
||||
"sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-12-07",
|
||||
"version": "2022-01-10",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
|
||||
"sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
|
||||
"rev": "80a40b07305373617eba2d5878d353532af77da3",
|
||||
"sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv"
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "98.0.4758.102",
|
||||
"sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im",
|
||||
"sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny",
|
||||
"sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l"
|
||||
"version": "99.0.4844.35",
|
||||
"sha256_linux": "1q10mn34s03zy0nqcgrjd7ry53g4paxpwcki1bgicpcrwnjlzc3y",
|
||||
"sha256_darwin": "0mcfry8vqqc8n1sgyn2azr8pc4lgjnkpnhz0ggjqm12njq0lfjfx",
|
||||
"sha256_darwin_aarch64": "19wpqd5mq2vrgma899vbbdqhg660x47v4ppbz1r8dcg5r5y93x3s"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
||||
@@ -3,7 +3,7 @@ let
|
||||
inherit (pkgs) callPackage fetchurl;
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.17";
|
||||
ptb = "0.0.27";
|
||||
ptb = "0.0.29";
|
||||
canary = "0.0.133";
|
||||
} else {
|
||||
stable = "0.0.264";
|
||||
@@ -26,7 +26,7 @@ let
|
||||
ptb = fetchurl {
|
||||
url =
|
||||
"https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb";
|
||||
sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url =
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.31.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.33.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-6w6znIIN5TFXTLLhazWyBXiqS5882zMNRZxYxnZjRHA=";
|
||||
sha256 = "03c7pw6cmv8ryw2wqsfc27d953950jc8nxs58mgk08g62v4qa672";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-photos";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
|
||||
repoName = "photos";
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY=";
|
||||
sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-greeter";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
repoName = "greeter";
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
|
||||
sha256 = "sha256-0chBM8JuCYgZXHneiSxSICZwBVm2Vgx+bas9wUjbnyg=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@@ -94,18 +94,6 @@ stdenv.mkDerivation rec {
|
||||
src = ./hardcode-fallback-background.patch;
|
||||
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
|
||||
})
|
||||
# Revert "UserCard: use accent color for logged_in check (#566)"
|
||||
# https://github.com/elementary/greeter/pull/566
|
||||
# Fixes crash issue reported in:
|
||||
# https://github.com/elementary/greeter/issues/578
|
||||
# https://github.com/NixOS/nixpkgs/issues/151609
|
||||
# Probably also fixes:
|
||||
# https://github.com/elementary/greeter/issues/568
|
||||
# https://github.com/elementary/greeter/issues/583
|
||||
# https://github.com/NixOS/nixpkgs/issues/140513
|
||||
# Revisit this when the greeter is ported to GTK 4:
|
||||
# https://github.com/elementary/greeter/pull/591
|
||||
./revert-pr566.patch
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Tue, 25 Jan 2022 10:03:31 +0800
|
||||
Subject: [PATCH] Revert "UserCard: use accent color for logged_in check
|
||||
(#566)"
|
||||
|
||||
This reverts commit 6f18c79c780582e43039032f6926816efa82e206.
|
||||
---
|
||||
data/Check.css | 11 -----------
|
||||
data/greeter.gresource.xml | 1 -
|
||||
src/Cards/UserCard.vala | 29 +++--------------------------
|
||||
3 files changed, 3 insertions(+), 38 deletions(-)
|
||||
delete mode 100644 data/Check.css
|
||||
|
||||
diff --git a/data/Check.css b/data/Check.css
|
||||
deleted file mode 100644
|
||||
index 947db6b..0000000
|
||||
--- a/data/Check.css
|
||||
+++ /dev/null
|
||||
@@ -1,11 +0,0 @@
|
||||
-check {
|
||||
- background-color: @accent_color;
|
||||
- border-radius: 99px;
|
||||
- color: white;
|
||||
- margin: 2px;
|
||||
- min-height: 20px;
|
||||
- min-width: 20px;
|
||||
- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7);
|
||||
- -gtk-icon-source: -gtk-icontheme("check-active-symbolic");
|
||||
- -gtk-icon-transform: scale(0.6);
|
||||
-}
|
||||
diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml
|
||||
index 604c89a..ce9be29 100644
|
||||
--- a/data/greeter.gresource.xml
|
||||
+++ b/data/greeter.gresource.xml
|
||||
@@ -2,7 +2,6 @@
|
||||
<gresources>
|
||||
<gresource prefix="/io/elementary/greeter">
|
||||
<file alias="Card.css" compressed="true">Card.css</file>
|
||||
- <file alias="Check.css" compressed="true">Check.css</file>
|
||||
<file alias="DateTime.css" compressed="true">DateTime.css</file>
|
||||
<file alias="MainWindow.css" compressed="true">MainWindow.css</file>
|
||||
</gresource>
|
||||
diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
|
||||
index 83df22c..02d2b0a 100644
|
||||
--- a/src/Cards/UserCard.vala
|
||||
+++ b/src/Cards/UserCard.vala
|
||||
@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
|
||||
private Gtk.Stack login_stack;
|
||||
private Greeter.PasswordEntry password_entry;
|
||||
|
||||
- private unowned Gtk.StyleContext logged_in_context;
|
||||
private weak Gtk.StyleContext main_grid_style_context;
|
||||
private weak Gtk.StyleContext password_entry_context;
|
||||
|
||||
@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard {
|
||||
};
|
||||
avatar_overlay.add (avatar);
|
||||
|
||||
- var logged_in = new SelectionCheck () {
|
||||
- halign = Gtk.Align.END,
|
||||
- valign = Gtk.Align.END
|
||||
- };
|
||||
-
|
||||
- logged_in_context = logged_in.get_style_context ();
|
||||
-
|
||||
if (lightdm_user.logged_in) {
|
||||
+ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR);
|
||||
+ logged_in.halign = logged_in.valign = Gtk.Align.END;
|
||||
+
|
||||
avatar_overlay.add_overlay (logged_in);
|
||||
|
||||
session_button.sensitive = false;
|
||||
@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
|
||||
gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color);
|
||||
|
||||
var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null);
|
||||
- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
|
||||
password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
|
||||
}
|
||||
|
||||
@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard {
|
||||
return GLib.Source.REMOVE;
|
||||
});
|
||||
}
|
||||
-
|
||||
- private class SelectionCheck : Gtk.Spinner {
|
||||
- private static Gtk.CssProvider check_provider;
|
||||
-
|
||||
- class construct {
|
||||
- set_css_name (Gtk.STYLE_CLASS_CHECK);
|
||||
- }
|
||||
-
|
||||
- static construct {
|
||||
- check_provider = new Gtk.CssProvider ();
|
||||
- check_provider.load_from_resource ("/io/elementary/greeter/Check.css");
|
||||
- }
|
||||
-
|
||||
- construct {
|
||||
- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
|
||||
- }
|
||||
- }
|
||||
}
|
||||
Reference in New Issue
Block a user