nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 17:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84215 from worldofpeace/pantheon-update-04-03

Browse Source 
Pantheon update 2020-04-03
This commit is contained in:
worldofpeace 2020-04-05 22:23:32 -04:00 committed by GitHub
commit 92e9009172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 173 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -181,7 +181,6 @@ in
hicolor-icon-theme
lightlocker
onboard
plank
qgnomeplatform
shared-mime-info
sound-theme-freedesktop
@ -195,6 +194,7 @@ in
# Desktop
elementary-default-settings
elementary-dock
elementary-session-settings
elementary-shortcut-overlay
gala
@ -206,7 +206,6 @@ in
})
# Services
cerbere
elementary-capnet-assist
elementary-dpms-helper
elementary-settings-daemon

16
nixos/modules/services/x11/desktop-managers/pantheon.xml
View File

@ -89,22 +89,6 @@ switchboard-with-plugs.override {
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-slow-shutdown">
<term>
Using Pantheon sometimes makes my shutdown take a long time.
</term>
<listitem>
<para>
We have not yet determined what processes fight with systemd during shutdown, there are many reports. In elementary OS the default system timeout is lowered to lessen the impact of the issue. If you'd like to do this in NixOS, set
<programlisting>
<xref linkend="opt-systemd.extraConfig"/> = ''
DefaultTimeoutStopSec=10s
DefaultTimeoutStartSec=10s
'';
</programlisting>
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
<term>
I cannot enable both GNOME 3 and Pantheon.

4
pkgs/desktops/pantheon/apps/appcenter/default.nix
View File

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.2.2";
version = "3.2.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0aqslkig7vs95z719mp3xrl1zp65ypp2lq9aikvsis6nssadn2cd";
sha256 = "12gql86vn12zbkw368blxk0cl9fgs22dyj02xnimjc8b6s80yib4";
};
passthru = {

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

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calculator";
version = "1.5.4";
version = "1.5.5";
repoName = "calculator";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0053bdzn5viqlni6qg6q39nma6bsddmhnafa0mzggiv8l4qasbrx";
sha256 = "1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View File

@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "5.0.3";
version = "5.0.4";
repoName = "calendar";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1dqcmh585fjib4m8bs7qy23fv429s7q9nbcqnn0vvmy1n36fic4m";
sha256 = "0ywk9w6d6nw7ir3f11xc13fr08ifvzpavq1c3x48kmmf69ywprdk";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-camera/default.nix
View File

@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "elementary-camera";
version = "1.0.5";
version = "1.0.6";
repoName = "camera";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "05amcljvc3w77a1b0c76y6rha8g0zm6lqflvg1g7jzz00jchx9d4";
sha256 = "13jg224h2436swd6kdkfs22icg0ja9lshvxwg5bqnb5fshspkjba";
};
passthru = {

4
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "elementary-code";
version = "3.3.0";
version = "3.4.0";
repoName = "code";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0v544zw99wjcy0bflaci9fssx4sibz4b05bxs3a7j8hrpl102r4w";
sha256 = "0b1vdgb1xvh5lqbral3r0qaq05zd5q5ywxw02fggpyy8nyxs3z8f";
};
passthru = {

78
pkgs/desktops/pantheon/apps/elementary-dock/default.nix Normal file
View File

@ -0,0 +1,78 @@
{ stdenv
, fetchFromGitHub
, vala
, atk
, cairo
, dconf
, glib
, gtk3
, libwnck3
, libX11
, libXfixes
, libXi
, pango
, gettext
, pkgconfig
, libxml2
, bamf
, gdk-pixbuf
, libdbusmenu-gtk3
, gnome-menus
, libgee
, wrapGAppsHook
, pantheon
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "elementary-dock";
version = "unstable-2020-02-28";
outputs = [ "out" "dev" ];
repoName = "dock";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "ac87d9063dc9c81d90f42f3002ad9c5b49460a82";
sha256 = "0lhjzd370fza488dav8n155ss486wqv6y7ldkahwg0c3zvlsvha7";
};
nativeBuildInputs = [
gettext
meson
ninja
libxml2 # xmllint
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
atk
bamf
cairo
gdk-pixbuf
glib
gnome-menus
dconf
gtk3
libX11
libXfixes
libXi
libdbusmenu-gtk3
libgee
libwnck3
pango
];
meta = with stdenv.lib; {
description = "Elegant, simple, clean dock";
homepage = "https://github.com/elementary/dock";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;
};
}

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.4.1";
version = "4.4.2";
repoName = "files";
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0s874qnqbx20vyp2z2rhz3z8py0dm21v26xc0h6hyc2gfz4s3jcg";
sha256 = "1n18b3m3vgvmmgpfbgnfnz0z98bkgbfrfkx25jqbwsdnwrlb4li6";
};
passthru = {

14
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View File

@ -16,12 +16,13 @@
, libgee
, elementary-icon-theme
, appstream
, pcre2
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "5.5.1";
version = "5.5.2";
repoName = "terminal";
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1b8fzs9s7djhwp02l3fwjpwxylklpbnw7x46mv7c8ksbp0m75iyj";
sha256 = "119iwmzbpkj4nmxinqfsh73lx23g8gbl6ha6wc4mc4fq9hpnc9c2";
};
passthru = {
@ -38,14 +39,6 @@ stdenv.mkDerivation rec {
};
};
patches = [
# fix build with vte-2.91 https://github.com/elementary/terminal/pull/488
(fetchpatch {
url = "https://github.com/elementary/terminal/commit/48da5328cefdc481a3ac76fbdd771096f542d55a.patch";
sha256 = "1y4043jxb0qzd3pp28kdij2yj1p9pg158il7q3aq1sf7c474gz4d";
})
];
nativeBuildInputs = [
appstream
desktop-file-utils
@ -64,6 +57,7 @@ stdenv.mkDerivation rec {
gtk3
libgee
libnotify
pcre2
vte
];

4
pkgs/desktops/pantheon/apps/sideload/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "sideload";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0camg34skiisfbf9s9awfkdkq72s9jhl4ipmax7dqr33n8a86hic";
sha256 = "1nnaq4vc0aag6pckxhrma5qv8al7i00rrlg95ac4iqqmivja7i92";
};
passthru = {

6
pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-a11y";
version = "2.1.3";
version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd";
sha256 = "0g8lhdwv9g16kjn7yxnl6x4rscjl2206ljfnghpxc4b5lwhqxxnw";
};
patches = [
@ -51,8 +51,6 @@ stdenv.mkDerivation rec {
switchboard
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Universal Access Plug";
homepage = https://github.com/elementary/switchboard-plug-a11y;

13
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-datetime";
version = "2.1.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "09734c3qc0296zf14rdhl4p6ppga015rz9hhsvlcc3nvyw7kdqkc";
sha256 = "0lpmxl42r5vn6mddwppn6zwmai0yabs3n467w027vkzw4axdi6bf";
};
passthru = {
@ -46,15 +46,6 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
(substituteAll {
src = ./timezone.patch;
tzdata = "${tzdata}/share/zoneinfo/zone.tab";
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Date & Time Plug";
homepage = https://github.com/elementary/switchboard-plug-datetime;

13
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/Parser.vala b/src/Parser.vala
index faccb64..432a362 100644
--- a/src/Parser.vala
+++ b/src/Parser.vala
@@ -28,7 +28,7 @@ public class DateTime.Parser : GLib.Object {
return parser;
}
private Parser () {
- var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab");
+ var file = File.new_for_path ("@tzdata@");
if (!file.query_exists ()) {
critical ("/usr/share/zoneinfo/zone.tab doesn't exist !");
return;

18
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
version = "2.3.5";
version = "2.3.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "17iijb7imxw5zv7vkrbc1vsp87k900yqgyv7ycz1gw37xb4klsyp";
sha256 = "08zpw7ygrqmwwznvxkf4xbrgwbjkbwc95sw1ikikg3143ql9qclp";
};
passthru = {
@ -51,20 +51,6 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
(substituteAll {
src = ./xkb.patch;
config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml";
})
# Fix build with latest vala.
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/28fa960f607f0b1d67f2864965a079bdfc23e3a8.patch";
sha256 = "0121qcg8n7gkz7gpwrxc1cx0nnypj02zy2jmp3cks5r9sc0yi0hw";
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Keyboard Plug";
homepage = https://github.com/elementary/switchboard-plug-keyboard;

22
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/Layout/Handler.vala b/src/Layout/Handler.vala
index 297314b..b36509a 100644
--- a/src/Layout/Handler.vala
+++ b/src/Layout/Handler.vala
@@ -29,7 +29,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object {
}
private void parse_layouts () {
- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml");
+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@");
if (doc == null) {
critical ("'evdev.xml' not found or permissions missing\n");
return;
@@ -76,7 +76,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object {
public HashTable<string, string> get_variants_for_language (string language) {
var returned_table = new HashTable<string, string> (str_hash, str_equal);
returned_table.set ("", _("Default"));
- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml");
+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@");
if (doc == null) {
critical ("'evdev.xml' not found or permissions incorrect\n");
return returned_table;

4
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145";
sha256 = "0pqkr7swjgla8klcjdcwgk2fipiwvylk8m71l1fymazvzwxrbxw6";
};
passthru = {

23
pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala
index 82e7826..cf00145 100644
index ba9dc22..a12871a 100644
--- a/src/Views/VPNPage.vala
+++ b/src/Views/VPNPage.vala
@@ -265,7 +265,7 @@ public class Network.VPNPage : Network.Widgets.Page {
@@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page {
private void try_connection_editor (string args) {
try {
var appinfo = AppInfo.create_from_commandline (
@ -12,24 +12,15 @@ index 82e7826..cf00145 100644
GLib.AppInfoCreateFlags.NONE
);
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index ed36b38..bc71c0c 100644
index 5849b69..7bbd172 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) {
@@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button {
clicked.connect (() => {
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
- "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
);
appinfo.launch (null, null);

6
pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-notifications";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0p0aj3bbjrh6x8wajqqb5yqm2iqfnj7kp16zf4hdr4siw0sx5p8n";
sha256 = "1ikq058svdan0whg4ks35m50apvbmzcz7h2wznxdbsimczzvj5sz";
};
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 Notifications Plug";
homepage = https://github.com/elementary/switchboard-plug-notifications;

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.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1b25slfh8166v9z2zmb25k64pcj0lh001qh04qhfilzfcbh54krj";
sha256 = "0hmchx0sfdm2c2f9khjvlaqcxmvzarn2vmwcdb3h5ifbj32vydzw";
};
passthru = {

4
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.7";
version = "2.1.8";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "03r67q6my10i4hl8d0q3d6fhqm9abs9kn9j92hk6ykqb4ybxw1z1";
sha256 = "0nnzwpfxkvgsw3g329926c3m7vci6vyb60qib7b9mpgicmsqnkvz";
};
passthru = {

14
pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sharing";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1yi6aga9i18wwn22zwmfbhsk16f92fka837is5r8xghqb7a50hyh";
sha256 = "1awkz16nydlgi8a2dd6agfnd3qwl2qsvv6wnn8bhaz1kbv1v9kpw";
};
passthru = {
@ -43,16 +43,6 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
# Fix build with latest vala
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-sharing/commit/22c9d52577a2e8c36c840a99009420266a39e1fe.patch";
sha256 = "0rbf1yxhc7k44cwikd45mv2g6slzw0rkwn5s38q3yxai9jnpvqch";
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Sharing Plug";
homepage = https://github.com/elementary/switchboard-plug-sharing;

4
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.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1aa9wgaz34glrrnilnqis3k0bnx2a2ir38j493y4d0klkjkwyn5k";
sha256 = "1vpw06ldhy26xs5vp2gx5s8wbl42dznycp3jsnm5qp8iid8wl6l6";
};
passthru = {

4
pkgs/desktops/pantheon/apps/switchboard/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard";
version = "2.3.8";
version = "2.3.9";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1y254irl07fp70228zm268w20zd7risz0sk9i9wz59yynxwjshbx";
sha256 = "0gq2gi14ywmhhlq3vablzqjzxq2ms60l9b10splzsf3zd7k2dqz2";
};
passthru = {

6
pkgs/desktops/pantheon/default.nix
View File

@ -47,6 +47,8 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-code = callPackage ./apps/elementary-code { };
elementary-dock = callPackage ./apps/elementary-dock { };
elementary-files = callPackage ./apps/elementary-files { };
elementary-feedback = callPackage ./apps/elementary-feedback { };
@ -99,8 +101,6 @@ lib.makeScope pkgs.newScope (self: with self; {
#### SERVICES
cerbere = callPackage ./services/cerbere { };
contractor = callPackage ./services/contractor { };
elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { };
@ -200,4 +200,6 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) vala; # added 2019-10-10
cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
})

4
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View File

@ -28,7 +28,7 @@
stdenv.mkDerivation rec {
pname = "elementary-greeter";
version = "5.0.2";
version = "5.0.3";
repoName = "greeter";
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0557lr8czqwjrm39ykfacqw5x7nng7fmf1gxkif70xg7dk3lc7gd";
sha256 = "1zbfcdgjn57r8pz01xrz6kk8rmviq133snz9f1vqhjdsznk82w5i";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "1.1.0";
version = "1.2.0";
repoName = "onboarding";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "17fw95qg7j0mvam90jrvr77hw2ipxb2lkw0xxql1lzwvdx1h0r2k";
sha256 = "0yxafz7jlzj8gsbp6m72q4zbcvm1ch2y4fibj9cymjvz2i0izhba";
};
passthru = {

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.1.0";
version = "1.1.1";
repoName = "shortcut-overlay";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "10s44x5qln3asrdr6v5b3v92prh8rfhv96dbm73zhifm2jjm22g8";
sha256 = "03wnc3vfnrkm5i7h370n7h2mbcmaxnhynmjs37q63vq6vq7agldb";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/gala/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "gala";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix";
sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs";
};
passthru = {

30
pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
View File

@ -1,22 +1,20 @@
diff --git a/meson.build b/meson.build
index 6b20a60..205699b 100644
index 78113d6..926596c 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,7 @@ conf.set_quoted('PACKAGE_VERSION', gala_version)
@@ -24,13 +24,14 @@ vapi_dir = meson.current_source_dir() / 'vapi'
data_dir = join_paths(get_option('prefix'), get_option('datadir'))
plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
+plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins')
pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
conf = configuration_data()
conf.set_quoted('DATADIR', data_dir)
conf.set_quoted('PKGDATADIR', pkgdata_dir)
conf.set_quoted('PKGLIBDIR', pkglib_dir)
-conf.set_quoted('PLUGINSDIR', plugins_dir)
+conf.set_quoted('PLUGINSDIR', '/run/current-system/sw/lib/gala/plugins')
conf.set_quoted('RELEASE_NAME', 'Window Manager.')
-conf.set_quoted('PLUGINDIR', plugins_dir)
+conf.set_quoted('PLUGINDIR', plugins_dir_for_build)
conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
conf.set_quoted('VERSION', gala_version)
conf.set_quoted('VERSION_INFO', (is_release ? 'Release' : 'Development'))
@@ -83,7 +83,7 @@ add_project_arguments([
'-DDATADIR="@0@"'.format(data_dir),
'-DPKGDATADIR="@0@"'.format(pkgdata_dir),
'-DPKGLIBDIR="@0@"'.format(pkglib_dir),
- '-DPLUGINDIR="@0@"'.format(plugins_dir),
+ '-DPLUGINDIR="@0@"'.format('/run/current-system/sw/lib/gala/plugins'),
'-DSCHEMA="org.pantheon.desktop.gala"',
'-DRESOURCEPATH="/org/pantheon/desktop/gala"',
conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')

15
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, fetchFromGitHub
, pantheon
, pkgconfig
, meson
@ -20,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0y8lfrrkzcj8nw94jqawbxr4jz41ac0z539kkr3n3x0qmx72md2y";
sha256 = "0a0pqrpmrdd5pch30lizr9righlc7165z7krmnaxrzd0fvfkbr2h";
};
passthru = {
@ -54,14 +53,6 @@ stdenv.mkDerivation rec {
wingpanel
];
patches = [
# Add support for libecal-2.0
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf.patch";
sha256 = "011q9b4pjmk4fpq5zscl5r8m4n3jiyx464023h4j7zf8r1070jz6";
})
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py

10
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0jc12xfaj3micpjssxc7m6hzssvyq26ln5az05x5f1j6v8lccbyn";
sha256 = "0q32qc6jh5w0i1ixkl59pys8r3hxmbig8854q7sxi07vlk9g3i7y";
};
passthru = {
@ -45,18 +45,16 @@ stdenv.mkDerivation rec {
gtk3
libgee
wingpanel
xorg.xkeyboardconfig
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
libgnomekbd_path = "${libgnomekbd}/bin/";
config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml";
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
})
];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Keyboard Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-keyboard;

17
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala
index cd7ca49..0bef9c7 100644
index cd7ca49..7813789 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
@ -7,20 +7,7 @@ index cd7ca49..0bef9c7 100644
close ();
- string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
+ string command = "@libgnomekbd_path@gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
+ string command = "@gkbd_keyboard_display@ \"--layout=" + layouts.get_current_with_variant () + "\"";
try {
AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);
diff --git a/src/LayoutsManager.vala b/src/LayoutsManager.vala
index 1bac80e..67df847 100644
--- a/src/LayoutsManager.vala
+++ b/src/LayoutsManager.vala
@@ -97,7 +97,7 @@ public class Keyboard.Widgets.LayoutManager : Gtk.ScrolledWindow {
public string? get_name_for_xkb_layout (string language, string? variant) {
debug ("get_name_for_xkb_layout (%s, %s)", language, variant);
- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml");
+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@");
if (doc == null) {
critical ("'evdev.xml' not found or permissions incorrect\n");
return null;

6
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0fch27imk5x4nfx49cwcylkxd7m289rl9niy1vx5kjplhbhyhdq2";
sha256 = "17s5fixhwgalgjhrhnb3wh0hdzi17waqcdfw1fx8q4zs78hapjzg";
};
passthru = {
@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
wingpanel
];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Network Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-network;

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1lx023z7xxlgwh0br48fw5w7xw673p2sqxwl1gz9f54xx7rv81py";
sha256 = "0qp13iaf2956ss4d6w6vwnzdvb7izqmyh6xrdii7j8gxxwjd4lxm";
};
passthru = {

6
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-power";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "02gp9m9zkmhcl43nz02kjkcim4zm25zab3il8dhwkihh731g1c6j";
sha256 = "19zhgzyivf3y416r5xaajx81h87zdhvrrcsagli00gp1f2169q5m";
};
passthru = {
@ -50,8 +50,6 @@ stdenv.mkDerivation rec {
wingpanel
];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
version = "2.2.7";
version = "2.2.8";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0qgb225ldg3qax370z3wvijxmm4bjfqds3r9aqqhlq30599xjhsb";
sha256 = "02inp8xdxfx8qxjdf2nazw46ahp1gv3skd922ma6kgx5w4wxh5l8";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "00r3dqkyp7k34xwn12l0dbzfmz70084lblxchykmk77pgzid2a0b";
sha256 = "0nla8qgn5gb1g2gn7c47m9zw42sarjd0030x3h5kckapsbaxknhp";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.2.6";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0q5jhg3gpcjfzfi7g33fv8pb916cqsgk6543b82yy97c20902ap9";
sha256 = "0m3pd4sf86kk1wv9asq4z2816bcal076vlk820mrdz9b2fm79lh3";
};
passthru = {

4
pkgs/desktops/pantheon/granite/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "5.3.0";
version = "5.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1gvrk8gh959bmq8w0kaym7sx13v763lk8x5hck00msgmyrsarfwa";
sha256 = "12f1n07cjlc7czf642ak6964wl4fsgakc39nnmiba22z5aahfpz9";
};
passthru = {

58
pkgs/desktops/pantheon/services/cerbere/default.nix
View File

@ -1,58 +0,0 @@
{ stdenv
, fetchFromGitHub
, pantheon
, pkgconfig
, meson
, python3
, ninja
, glib
, libgee
, vala_0_46
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "cerbere";
version = "2.5.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12y6gg4vyc1rhdm2c7pr7bgmdrah7ddphyh25fgh3way8l9gh7vw";
};
passthru = {
updateScript = pantheon.updateScript {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
pkgconfig
python3
vala_0_46
wrapGAppsHook
];
buildInputs = [
glib
libgee
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
description = "A simple service to ensure uptime of essential processes";
homepage = https://github.com/elementary/cerbere;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}