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

Merge pull request #73781 from worldofpeace/pantheon-5.1-more

Browse source 
Pantheon 5.1 (second set of updates etc.)
This commit is contained in:
worldofpeace 2019-11-22 10:36:45 +00:00 committed by GitHub
commit f6c9fb0df3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 145 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
View file

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calculator";
version = "1.5.2";
version = "1.5.3";
repoName = "calculator";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl";
sha256 = "0ibnj3zm93p8ghiy8gbbm0vlig9mnqjsvvp1cpw62dnap0qixdcg";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
View file

@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "elementary-photos";
version = "2.6.4";
version = "2.6.5";
repoName = "photos";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
sha256 = "0r6d9y936nw4bn0jvixi1p62dy8qsgl2bx8g3889fndnhfnhbjv0";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
View file

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
version = "1.6.2";
version = "1.7.0";
repoName = "screenshot";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q";
sha256 = "09jcyy4drzpfxb1blln7hyjg5b7r8w5j5v7va2qhq31y7vzczh62";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View file

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "5.3.6";
version = "5.4.0";
repoName = "terminal";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3";
sha256 = "1rj4hrg5qljsv11apgdp0x4dazlfmjq3s0lk0dvwjvh9nqkr6jbw";
};
passthru = {

4
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12ysymk5y2k49yh3rzmra7jmimxrd54gz2f4ssc9i8w06xj5djp7";
sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71";
};
passthru = {

6
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-applications";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1c4agff456625kycacpsww7c9jsnsg1rqps96r7cvn9zq371b5ir";
sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg";
};
passthru = {
@ -42,8 +42,6 @@ stdenv.mkDerivation rec {
switchboard
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Applications Plug";
homepage = https://github.com/elementary/switchboard-plug-applications;

4
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.1.9";
version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0g9apywxgkan82h933rjjdm9fhd8vak8mziwsbqlprdz310b2jb2";
sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh";
};
passthru = {

8
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0mr25p7j5hl8zmvz5i3g30s4xbdhk6d22lw2akch3si40il9q5fv";
sha256 = "1cg69nbdf4mcr16mi71aw9j8877lyj8yxjfk9bd3sml8f4fh7mmr";
};
patches = [
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace src/Views/General.vala \
substituteInPlace src/Views/Clicking.vala \
--subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon}
'';
@ -54,8 +54,6 @@ stdenv.mkDerivation rec {
switchboard
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Mouse & Touchpad Plug";
homepage = https://github.com/elementary/switchboard-plug-mouse-touchpad;

81
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
View file

@ -1,63 +1,76 @@
diff --git a/src/Views/General.vala b/src/Views/General.vala
index 4b19b73..dfa3d4d 100644
--- a/src/Views/General.vala
+++ b/src/Views/General.vala
@@ -138,32 +138,34 @@ public class MouseTouchpad.GeneralView : Gtk.Grid {
attach (pointer_speed_scale, 3, 8);
attach (pointer_speed_help, 1, 9, 3);
diff --git a/src/Views/Clicking.vala b/src/Views/Clicking.vala
index cc4431b..d12ddfe 100644
--- a/src/Views/Clicking.vala
+++ b/src/Views/Clicking.vala
@@ -123,42 +123,39 @@ public class MouseTouchpad.ClickingView : Granite.SimpleSettingsPage {
content_area.attach (hold_scale, 3, 3);
content_area. attach (hold_help, 1, 4, 3);
- var xsettings_schema = SettingsSchemaSource.get_default ().lookup ("org.gnome.settings-daemon.plugins.xsettings", false);
- var xsettings_schema = SettingsSchemaSource.get_default ().lookup (
- "org.gnome.settings-daemon.plugins.xsettings",
- true
- );
-
- if (xsettings_schema != null) {
- var primary_paste_switch = new Gtk.Switch ();
- primary_paste_switch.halign = Gtk.Align.START;
-
- var primary_paste_help = new Gtk.Label (_("Middle or three-finger clicking on an input will paste any selected text"));
+ SettingsSchemaSource daemon_schema_source = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS@", null, true);
+ SettingsSchema xsettings_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.plugins.xsettings", false);
- var primary_paste_help = new Gtk.Label (
- _("Middle or three-finger clicking on an input will paste any selected text")
- );
- primary_paste_help.margin_bottom = 18;
- primary_paste_help.wrap = true;
- primary_paste_help.xalign = 0;
- primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-
- attach (new SettingLabel (_("Middle click paste:")), 0, 4);
- attach (primary_paste_switch, 1, 4);
- attach (primary_paste_help, 1, 5, 3);
- content_area.attach (new SettingLabel (_("Middle click paste:")), 0, 5);
- content_area.attach (primary_paste_switch, 1, 5);
- content_area.attach (primary_paste_help, 1, 6, 3);
-
- var xsettings = new GLib.Settings ("org.gnome.settings-daemon.plugins.xsettings");
- primary_paste_switch.notify["active"].connect (() => on_primary_paste_switch_changed (primary_paste_switch, xsettings));
-
- var current_value = xsettings.get_value ("overrides").lookup_value ("Gtk/EnablePrimaryPaste", VariantType.INT32);
- primary_paste_switch.notify["active"].connect (() => {
- on_primary_paste_switch_changed (primary_paste_switch, xsettings);
- });
+ var primary_paste_switch = new Gtk.Switch ();
+ primary_paste_switch.halign = Gtk.Align.START;
- var current_value = xsettings.get_value ("overrides").lookup_value (
- "Gtk/EnablePrimaryPaste",
- VariantType.INT32
- );
- if (current_value != null) {
- primary_paste_switch.active = current_value.get_int32 () == 1;
- }
+ var primary_paste_switch = new Gtk.Switch ();
+ primary_paste_switch.halign = Gtk.Align.START;
+
+ var primary_paste_help = new Gtk.Label (_("Middle or three-finger clicking on an input will paste any selected text"));
+ var primary_paste_help = new Gtk.Label (
+ _("Middle or three-finger clicking on an input will paste any selected text")
+ );
+ primary_paste_help.margin_bottom = 18;
+ primary_paste_help.wrap = true;
+ primary_paste_help.xalign = 0;
+ primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
+
+ attach (new SettingLabel (_("Middle click paste:")), 0, 4);
+ attach (primary_paste_switch, 1, 4);
+ attach (primary_paste_help, 1, 5, 3);
+
+ SettingsSchemaSource daemon_schema_source = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS@", null, true);
+ SettingsSchema xsettings_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.plugins.xsettings", false);
+ content_area.attach (new SettingLabel (_("Middle click paste:")), 0, 5);
+ content_area.attach (primary_paste_switch, 1, 5);
+ content_area.attach (primary_paste_help, 1, 6, 3);
+
+ var xsettings = new GLib.Settings.full (xsettings_schema, null, null);
+ primary_paste_switch.notify["active"].connect (() => on_primary_paste_switch_changed (primary_paste_switch, xsettings));
+ primary_paste_switch.notify["active"].connect (() => {
+ on_primary_paste_switch_changed (primary_paste_switch, xsettings);
+ });
+
+ var current_value = xsettings.get_value ("overrides").lookup_value ("Gtk/EnablePrimaryPaste", VariantType.INT32);
+ var current_value = xsettings.get_value ("overrides").lookup_value (
+ "Gtk/EnablePrimaryPaste",
+ VariantType.INT32
+ );
+ if (current_value != null) {
+ primary_paste_switch.active = current_value.get_int32 () == 1;
}
- var daemon_settings = new GLib.Settings ("org.gnome.settings-daemon.peripherals.mouse");
- daemon_settings.bind ("locate-pointer", reveal_pointer_switch, "active", GLib.SettingsBindFlags.DEFAULT);
+ SettingsSchema daemon_mouse_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.peripherals.mouse", false);
+
+ var daemon_mouse_settings = new GLib.Settings.full (daemon_mouse_schema, null, null);
+ daemon_mouse_settings.bind ("locate-pointer", reveal_pointer_switch, "active", GLib.SettingsBindFlags.DEFAULT);
+ SettingsSchema daemon_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.peripherals.mouse", false);
+ var daemon_settings = new GLib.Settings.full (daemon_schema, null, null);
daemon_settings.bind ("double-click", double_click_speed_adjustment, "value", SettingsBindFlags.DEFAULT);
var a11y_mouse_settings = new GLib.Settings ("org.gnome.desktop.a11y.mouse");
a11y_mouse_settings.bind ("secondary-click-enabled", hold_switch, "active", GLib.SettingsBindFlags.DEFAULT);

10
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
version = "2.1.4";
version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12lvcc15jngzsa40fjhxa6kccs58h5qq4lqrc7lcx5przmfaik8k";
sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145";
};
passthru = {
@ -49,14 +49,12 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./nma.patch;
networkmanagerapplet = networkmanagerapplet;
src = ./fix-paths.patch;
inherit networkmanagerapplet;
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Networking Plug";
homepage = https://github.com/elementary/switchboard-plug-network;

35
pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch Normal file
View file

@ -0,0 +1,35 @@
diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala
index 82e7826..cf00145 100644
--- a/src/Views/VPNPage.vala
+++ b/src/Views/VPNPage.vala
@@ -265,7 +265,7 @@ public class Network.VPNPage : Network.Widgets.Page {
private void try_connection_editor (string args) {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor %s".printf (args),
+ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args),
null,
GLib.AppInfoCreateFlags.NONE
);
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index ed36b38..bc71c0c 100644
--- a/src/Widgets/SettingsButton.vala
+++ b/src/Widgets/SettingsButton.vala
@@ -24,7 +24,7 @@
clicked.connect (() => {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor",
+ "@networkmanagerapplet@/bin/nm-connection-editor",
null,
AppInfoCreateFlags.NONE
);
@@ -71,7 +71,7 @@
private void edit_connection_uuid (string uuid) {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
);
appinfo.launch (null, null);

43
pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
View file

@ -1,43 +0,0 @@
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index 19fd514..bc800d9 100644
--- a/src/Widgets/SettingsButton.vala
+++ b/src/Widgets/SettingsButton.vala
@@ -23,7 +23,7 @@
label = _("Edit Connections…");
clicked.connect (() => {
try {
- var appinfo = AppInfo.create_from_commandline ("nm-connection-editor", null, AppInfoCreateFlags.NONE);
+ var appinfo = AppInfo.create_from_commandline ("@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE);
appinfo.launch (null, null);
} catch (Error e) {
warning ("%s", e.message);
@@ -61,13 +61,13 @@
label = title;
clicked.connect (() => {
edit_connection_uuid (connection.get_uuid ());
- });
+ });
}
private void edit_connection_uuid (string uuid) {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
);
appinfo.launch (null, null);
diff --git a/src/Widgets/VPN/VPNPage.vala b/src/Widgets/VPN/VPNPage.vala
index 23c3ae9..c71984c 100644
--- a/src/Widgets/VPN/VPNPage.vala
+++ b/src/Widgets/VPN/VPNPage.vala
@@ -86,8 +86,7 @@ namespace Network {
add_button.tooltip_text = _("Add VPN Connection…");
add_button.clicked.connect (() => {
add_button.sensitive = false;
- var command = new Granite.Services.SimpleCommand ("/usr/bin",
- "nm-connection-editor --create --type=vpn");
+ var command = new Granite.Services.SimpleCommand ("@networkmanagerapplet@", "bin/nm-connection-editor --create --type=vpn");
command.done.connect ((exit) => {
if (exit != 0) {
var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, "%s", _("Failed to run Connection Editor."));

14
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "2.8.1";
version = "2.8.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw";
sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z";
};
passthru = {
@ -43,23 +43,17 @@ stdenv.mkDerivation rec {
patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
./hardcode-gsettings.patch
# Fixes https://github.com/elementary/switchboard-plug-pantheon-shell/issues/172
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/e4f86df6a6be402db4c979a4b005573618b744d1.patch";
sha256 = "0sa8611k6sqg96mnp2plmxd30w6zq76bfwszl8ankr9kwsgyc66y";
})
];
postPatch = ''
substituteInPlace src/Views/Appearance.vala \
--subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/HotCorners.vala \
--subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/Appearance.vala \
--subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
'';
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;

20
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
View file

@ -1,5 +1,5 @@
diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala
index 721d458..17e1c58 100644
index c8300cc..fc48a0e 100644
--- a/src/Views/Appearance.vala
+++ b/src/Views/Appearance.vala
@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid {
@ -17,7 +17,23 @@ index 721d458..17e1c58 100644
+ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false);
+
+ var panel_settings = new Settings.full (panel_schema, null, null);
+ var panel_settings = new GLib.Settings.full (panel_schema, null, null);
panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT);
var interface_settings = new Settings (INTERFACE_SCHEMA);
diff --git a/src/Views/HotCorners.vala b/src/Views/HotCorners.vala
index 481e7c5..d102d03 100644
--- a/src/Views/HotCorners.vala
+++ b/src/Views/HotCorners.vala
@@ -30,7 +30,10 @@ public class HotCorners : Gtk.Grid {
row_spacing = 24;
halign = Gtk.Align.CENTER;
- behavior_settings = new GLib.Settings ("org.pantheon.desktop.gala.behavior");
+
+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema behavior_schema = gala_schema_source.lookup ("org.pantheon.desktop.gala.behavior", false);
+ behavior_settings = new GLib.Settings.full (behavior_schema, null, null);
custom_command_revealer = new Gtk.Revealer ();

4
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-power";
version = "2.3.5";
version = "2.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1wcxz4jxyv8kms9gxpwvrb356h10qvcwmdjzjzl2bvj5yl1rfcs9";
sha256 = "1b25slfh8166v9z2zmb25k64pcj0lh001qh04qhfilzfcbh54krj";
};
passthru = {

14
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
version = "2.1.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "05pkf3whh51gd9d0h2h4clgf7r3mvzl4ybas7834vhy19dzcbzmc";
sha256 = "03r67q6my10i4hl8d0q3d6fhqm9abs9kn9j92hk6ykqb4ybxw1z1";
};
passthru = {
@ -45,16 +45,6 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
# Fix build with latest vala.
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-printers/commit/3175c2ebf106145a95355d2571e0a2aa4834e884.patch";
sha256 = "1b2q48a1284037nz79vjcrz8g2qpsyg7s5rag6bfp03a1ijb7gw3";
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Printers Plug";
homepage = https://github.com/elementary/switchboard-plug-printers;

6
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2";
sha256 = "1aa9wgaz34glrrnilnqis3k0bnx2a2ir38j493y4d0klkjkwyn5k";
};
passthru = {
@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
switchboard
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Sound Plug";
homepage = https://github.com/elementary/switchboard-plug-sound;

18
pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
View file

@ -14,12 +14,13 @@
, elementary-icon-theme
, elementary-gtk-theme
, gettext
, libhandy
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "1.0.1";
version = "1.1.0";
repoName = "onboarding";
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "025i9av4waqwp1gn8d6sjp8qdwg2j3jskxhmyf9qxbzwfc5msysg";
sha256 = "17fw95qg7j0mvam90jrvr77hw2ipxb2lkw0xxql1lzwvdx1h0r2k";
};
passthru = {
@ -48,20 +49,13 @@ stdenv.mkDerivation rec {
];
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
glib
granite
gtk3
elementary-gtk-theme
libgee
glib
];
patches = [
# Make sure we use our logo from /etc/os-release
(fetchpatch {
url = "https://github.com/elementary/onboarding/commit/03975bacb75741d3dd391a126217e415f43c6059.patch";
sha256 = "1yw7dysav90abxnmkv86bc60dyl8nvi0sgaiz8v39cc2x00rqsg1";
})
libhandy
];
postPatch = ''

4
pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
View file

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "elementary-shortcut-overlay";
version = "1.0.1";
version = "1.1.0";
repoName = "shortcut-overlay";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4";
sha256 = "10s44x5qln3asrdr6v5b3v92prh8rfhv96dbm73zhifm2jjm22g8";
};
passthru = {

4
pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "pantheon-agent-geoclue2";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1hjnbbzsch09090b200b3i85x8fv95agfqd6nrlc9za3jqjhm2xs";
sha256 = "1fhgdcykn0ykn8fp7inn2akygpglhdwfpdkpnih86kqmqj8siahv";
};
passthru = {

6
pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
View file

@ -7,19 +7,20 @@
, vala
, gtk3
, libgee
, granite
, polkit
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "pantheon-agent-polkit";
version = "0.1.6";
version = "1.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1g9l2jzpvv0dbvxh93w98a7ijsfqv3s3382li4s256179gihhd67";
sha256 = "1yybblprcn0cgcf9j76yckqcimm4h8l41cczxjvgp789p1pki3bn";
};
passthru = {
@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
granite
gtk3
libgee
polkit