mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge pull request #69052 from worldofpeace/elementary-updates-maybe-5.1

Browse source 
Pantheon 5.1
This commit is contained in:
worldofpeace 2019-11-03 17:03:04 +00:00 committed by GitHub
parent 7daa6ec9d4 d6cf4946da
commit c751f6000b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 459 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
pkgs/desktops/pantheon/apps/appcenter/default.nix Normal file
View file

@ -0,0 +1,92 @@
{ stdenv
, appstream
, appstream-glib
, dbus
, desktop-file-utils
, elementary-gtk-theme
, elementary-icon-theme
, fetchFromGitHub
, fetchpatch
, flatpak
, gettext
, glib
, granite
, gtk3
, json-glib
, libgee
, libsoup
, libxml2
, meson
, ninja
, packagekit
, pantheon
, pkgconfig
, python3
, vala
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0xsxm0qgmnljd4s8m6xajzsjp9skpsa8wwlwqmc5yx34diad7zag";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
};
};
nativeBuildInputs = [
appstream-glib
dbus # for pkgconfig
desktop-file-utils
gettext
meson
ninja
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
appstream
elementary-icon-theme
elementary-gtk-theme
flatpak
glib
granite
gtk3
json-glib
libgee
libsoup
libxml2
packagekit
];
mesonFlags = [
"-Dhomepage=false"
"-Dpayments=false"
"-Dcurated=false"
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
homepage = https://github.com/elementary/appcenter;
description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}

6
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View file

@ -25,15 +25,15 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "unstable-2019-09-17";
version = "unstable-2019-10-29";
repoName = "calendar";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "46346e48b53e9d3d59d9f567b622532338f50f32"; # needed for libical 2.0 compat
sha256 = "04xzczcj5rbzqlhmf175d8p0wzw01s4658v5jllrp8nchmndb986";
rev = "7d201fc5ea9e8dc25c46427397594fcab2016ed6"; # needed for libical 2.0 compat
sha256 = "11bqf3nxrj1sfd0qq5h0jsmimc6mwkd2g7q9ycizn9x5ak2gb8xi";
};
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.4";
version = "1.0.5";
repoName = "camera";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc";
sha256 = "05amcljvc3w77a1b0c76y6rha8g0zm6lqflvg1g7jzz00jchx9d4";
};
passthru = {

70
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix Normal file
View file

@ -0,0 +1,70 @@
{ stdenv
, fetchFromGitHub
, pantheon
, pkgconfig
, meson
, ninja
, vala
, python3
, gtk3
, glib
, granite
, libgee
, elementary-icon-theme
, elementary-gtk-theme
, gettext
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-feedback";
version = "1.0";
repoName = "feedback";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0rc4ifs4hd4cj0v028bzc45v64pwx21xylwrhb20jpw61ainfi8s";
};
passthru = {
updateScript = pantheon.updateScript {
inherit repoName;
attrPath = pname;
};
};
nativeBuildInputs = [
gettext
meson
ninja
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
elementary-gtk-theme
libgee
glib
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
description = "GitHub Issue Reporter designed for elementary OS";
homepage = https://github.com/elementary/feedback;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}

6
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file

@ -23,13 +23,14 @@
, zeitgeist
, glib-networking
, elementary-icon-theme
, libcloudproviders
, fetchpatch
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.1.9";
version = "4.2.0";
repoName = "files";
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv";
sha256 = "12f0hzb62nchksyqd2gwj3cv001rph24ggd9wywh9i1qwppx4b5k";
};
passthru = {
@ -67,6 +68,7 @@ stdenv.mkDerivation rec {
granite
gtk3
libcanberra
libcloudproviders
libdbusmenu-gtk3
libgee
libnotify

73
pkgs/desktops/pantheon/apps/sideload/default.nix Normal file
View file

@ -0,0 +1,73 @@
{ stdenv
, desktop-file-utils
, elementary-gtk-theme
, elementary-icon-theme
, fetchFromGitHub
, flatpak
, gettext
, glib
, granite
, gtk3
, libgee
, meson
, ninja
, pantheon
, pkgconfig
, python3
, vala
, libxml2
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "sideload";
version = "1.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1qi4wm773bf1szi5a77g9lxjn305v1m85j4nb6il9q4qlh9b1cs5";
};
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
};
};
nativeBuildInputs = [
desktop-file-utils
gettext
meson
ninja
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
elementary-gtk-theme
elementary-icon-theme
flatpak
glib
granite
gtk3
libgee
libxml2
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
homepage = https://github.com/elementary/sideload;
description = "Flatpak installer, designed for elementary OS";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}

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

@ -11,17 +11,18 @@
, gtk3
, switchboard
, pciutils
, elementary-feedback
}:
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "2.5.2";
version = "2.6.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "11diwz2aj45yqkxdija8ny0sgm0wl2905gl3799cdl12ss9ffndp";
sha256 = "12ysymk5y2k49yh3rzmra7jmimxrd54gz2f4ssc9i8w06xj5djp7";
};
passthru = {
@ -46,17 +47,15 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./lspci-path.patch;
src = ./fix-paths.patch;
inherit pciutils;
elementary_feedback = elementary-feedback;
})
./remove-update-button.patch
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard About Plug";
homepage = https://github.com/elementary/witchboard-plug-about;
homepage = https://github.com/elementary/switchboard-plug-about;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;

26
pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/src/Plug.vala b/src/Plug.vala
index c32efcbe..0cdaeaca 100644
--- a/src/Plug.vala
+++ b/src/Plug.vala
@@ -178,7 +178,7 @@ public class About.Plug : Switchboard.Plug {
var bug_button = new Gtk.Button.with_label (_("Report a Problem"));
bug_button.clicked.connect (() => {
- var appinfo = new GLib.DesktopAppInfo ("io.elementary.feedback.desktop");
+ var appinfo = new GLib.DesktopAppInfo ("@elementary_feedback@/bin/io.elementary.feedback.desktop");
if (appinfo != null) {
try {
appinfo.launch (null, null);
diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala
index f8113634..3794bad8 100644
--- a/src/Views/HardwareView.vala
+++ b/src/Views/HardwareView.vala
@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid {
// Graphics
try {
- Process.spawn_command_line_sync ("lspci", out graphics);
+ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics);
if ("VGA" in graphics) { //VGA-keyword indicates graphics-line
string[] lines = graphics.split("\n");

13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
View file

@ -1,13 +0,0 @@
diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala
index a3e449c..a95fe93 100644
--- a/src/Views/HardwareView.vala
+++ b/src/Views/HardwareView.vala
@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid {
// Graphics
try {
- Process.spawn_command_line_sync ("lspci", out graphics);
+ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics);
if ("VGA" in graphics) { //VGA-keyword indicates graphics-line
string[] lines = graphics.split("\n");

55
pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch
View file

@ -1,55 +0,0 @@
diff --git a/src/Plug.vala b/src/Plug.vala
index 76fca34..3e79c1f 100644
--- a/src/Plug.vala
+++ b/src/Plug.vala
@@ -65,7 +65,6 @@ public class About.Plug : Switchboard.Plug {
search_results.set ("%s → %s".printf (display_name, _("Restore Default Settings")), "");
search_results.set ("%s → %s".printf (display_name, _("Suggest Translation")), "");
search_results.set ("%s → %s".printf (display_name, _("Report Problems")), "");
- search_results.set ("%s → %s".printf (display_name, _("Updates")), "");
return search_results;
}
@@ -161,7 +160,7 @@ public class About.Plug : Switchboard.Plug {
var kernel_version_label = new Gtk.Label (kernel_version);
kernel_version_label.set_selectable (true);
- var gtk_version_label = new Gtk.Label (_("GTK+ %s").printf (gtk_version));
+ var gtk_version_label = new Gtk.Label (_("GTK+ %s").printf (gtk_version));
gtk_version_label.set_selectable (true);
var website_label = new Gtk.LinkButton.with_label (website_url, _("Website"));
@@ -202,16 +201,6 @@ public class About.Plug : Switchboard.Plug {
issue_dialog.run ();
});
- // Update button
- var update_button = new Gtk.Button.with_label (_("Check for Updates"));
- update_button.clicked.connect (() => {
- try {
- Process.spawn_command_line_async ("io.elementary.appcenter --show-updates");
- } catch (Error e) {
- warning (e.message);
- }
- });
-
// Restore settings button
var settings_restore_button = new Gtk.Button.with_label (_("Restore Default Settings"));
settings_restore_button.clicked.connect (settings_restore_clicked);
@@ -224,7 +213,6 @@ public class About.Plug : Switchboard.Plug {
button_grid.add (settings_restore_button);
button_grid.add (translate_button);
button_grid.add (bug_button);
- button_grid.add (update_button);
button_grid.set_child_non_homogeneous (help_button, true);
var software_grid = new Gtk.Grid ();
@@ -238,7 +226,7 @@ public class About.Plug : Switchboard.Plug {
software_grid.attach (based_off, 0, 2, 2, 1);
}
- software_grid.attach (kernel_version_label, 0, 3, 2, 1);
+ software_grid.attach (kernel_version_label, 0, 3, 2, 1);
software_grid.attach (gtk_version_label, 0, 4, 2, 1);
software_grid.attach (website_label, 0, 5, 2, 1);

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

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-bluetooth";
version = "2.2.2";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0rp9wa0yilc3wgwnybc6cryxphja7imixn45zhj475a4nb3afd0q";
sha256 = "1m8nzav976xs3sash2nbyrfn2sk7aah352ypihbp7bacid5wnhr7";
};
passthru = {
@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
switchboard
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Bluetooth Plug";
homepage = https://github.com/elementary/switchboard-plug-bluetooth;

12
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch
View file

@ -1,12 +0,0 @@
diff --git a/src/DateTime1.vala b/src/DateTime1.vala
index 5a80fbd..2e1f948 100644
--- a/src/DateTime1.vala
+++ b/src/DateTime1.vala
@@ -38,6 +38,6 @@ public class DateTime.Settings : Granite.Services.Settings {
public string clock_format { get; set; }
public Settings () {
- base ("io.elementary.desktop.wingpanel.datetime");
+ base ("io.elementary.granite");
}
}

6
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.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1iz8skf5dw76a07ljc8v8lw2x2nrmq8j6sggm227cmxy60gadsdv";
sha256 = "09734c3qc0296zf14rdhl4p6ppga015rz9hhsvlcc3nvyw7kdqkc";
};
passthru = {
@ -51,8 +51,6 @@ stdenv.mkDerivation rec {
src = ./timezone.patch;
tzdata = "${tzdata}/share/zoneinfo/zone.tab";
})
# Use "clock-format" GSettings key that's been moved to granite
./clock-format.patch
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

6
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.8";
version = "2.1.9";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1xpgkvcv3bylpaj7c80727vr55vilkgjvnlbw7d5pr56v6mv7n9j";
sha256 = "0g9apywxgkan82h933rjjdm9fhd8vak8mziwsbqlprdz310b2jb2";
};
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 Displays Plug";
homepage = https://github.com/elementary/switchboard-plug-display;

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

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0k2bq7l0m7qfpy1mkb3qvsinqd8n4lp0vwz3x64wlgfn2qipm1fn";
sha256 = "1dwq9rqswgnnglhrgcpvrp6shn3pb4x8f8f23x84sqakb430idp7";
};
passthru = {
@ -51,8 +51,6 @@ stdenv.mkDerivation rec {
zeitgeist
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
patches = [
./hardcode-gsettings.patch
];

15
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
View file

@ -1,25 +1,22 @@
diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala
index 994c4d1..5702de2 100644
index 0335c29..481b1c8 100644
--- a/src/Views/FirewallPanel.vala
+++ b/src/Views/FirewallPanel.vala
@@ -49,10 +49,13 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
@@ -49,7 +49,11 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
}
construct {
- settings = new Settings ("io.elementary.switchboard.security-privacy");
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false);
+
+ settings = new Settings.full (security_privacy_schema, null, null);
+
disabled_rules = new Gee.HashMap<string, UFWHelpers.Rule> ();
load_disabled_rules ();
-
+
status_switch.notify["active"].connect (() => {
if (loading == false) {
view.sensitive = status_switch.active;
diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala
index 081cf10..42f6118 100644
index 4f523f9..7135a83 100644
--- a/src/Views/LockPanel.vala
+++ b/src/Views/LockPanel.vala
@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage {
@ -32,5 +29,5 @@ index 081cf10..42f6118 100644
+
+ locker = new Settings.full (locker_schema, null, null);
var lock_suspend_label = new Gtk.Label (_("Lock on sleep:"));
var lock_suspend_label = new Gtk.Label (_("Lock on suspend:"));
var lock_suspend_switch = new Gtk.Switch ();

6
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
View file

@ -3,11 +3,12 @@
, pantheon
, meson
, ninja
, gettext
}:
stdenv.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "5.2.5";
version = "5.3.0";
repoName = "stylesheet";
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65";
sha256 = "0kxzgqgzbkwi0h4r7zc5yl57k8cm165d1ki1nzmb442wp42q438y";
};
passthru = {
@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
gettext
meson
ninja
];

4
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "5.0.4";
version = "5.1.0";
repoName = "icons";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx";
sha256 = "1yrf92ysjh1yfm42wznlw0lh9zsm5whghwzx3b3wcdkwdhkdg24z";
};
passthru = {

14
pkgs/desktops/pantheon/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, gnome3 }:
{ config, pkgs, lib, gnome3 }:
lib.makeScope pkgs.newScope (self: with self; {
@ -66,6 +66,8 @@ lib.makeScope pkgs.newScope (self: with self; {
#### APPS
appcenter = callPackage ./apps/appcenter { };
elementary-calculator = callPackage ./apps/elementary-calculator { };
elementary-calendar = callPackage ./apps/elementary-calendar { };
@ -76,6 +78,8 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-files = callPackage ./apps/elementary-files { };
elementary-feedback = callPackage ./apps/elementary-feedback { };
elementary-music = callPackage ./apps/elementary-music { };
elementary-photos = callPackage ./apps/elementary-photos { };
@ -86,12 +90,16 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-videos = callPackage ./apps/elementary-videos { };
sideload = callPackage ./apps/sideload { };
#### DESKTOP
elementary-default-settings = callPackage ./desktop/elementary-default-settings { };
elementary-greeter = callPackage ./desktop/elementary-greeter { };
elementary-onboarding = callPackage ./desktop/elementary-onboarding { };
elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
elementary-session-settings = callPackage ./desktop/elementary-session-settings {
@ -219,8 +227,10 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
} // lib.optionalAttrs (config.allowAliases or true) {
### ALIASES
vala = pkgs.vala; # added 2019-10-10
inherit (pkgs) vala; # added 2019-10-10
})

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

@ -28,7 +28,7 @@
stdenv.mkDerivation rec {
pname = "elementary-greeter";
version = "5.0";
version = "5.0.1";
repoName = "greeter";
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "01c8acarxwpakyq69xm4bjwppjf8v3ijmns8masd8raxligb2v8b";
sha256 = "0qy6iw71p8hv6fpcr7p3hqbzlcpxrz18qdm1inannq68d0pxfx76";
};
passthru = {

10
pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-fallback-background.patch
View file

@ -1,7 +1,7 @@
diff --git a/src/Cards/BackgroundImage.vala b/src/Cards/BackgroundImage.vala
index b57fb4d..ddfd56c 100644
--- a/src/Cards/BackgroundImage.vala
+++ b/src/Cards/BackgroundImage.vala
diff --git a/src/Widgets/BackgroundImage.vala b/src/Widgets/BackgroundImage.vala
index ae9431c..f0f2a49 100644
--- a/src/Widgets/BackgroundImage.vala
+++ b/src/Widgets/BackgroundImage.vala
@@ -9,7 +9,7 @@ public class Greeter.BackgroundImage : Gtk.EventBox {
public BackgroundImage (string? path) {
@ -16,7 +16,7 @@ index b57fb4d..ddfd56c 100644
try {
- full_pixbuf = new Gdk.Pixbuf.from_file ("/usr/share/backgrounds/elementaryos-default");
+ full_pixbuf = new Gdk.Pixbuf.from_file ("@default_wallpaper");
+ full_pixbuf = new Gdk.Pixbuf.from_file ("@default_wallpaper@");
} catch (GLib.Error e) {
critical (e.message);
}

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

@ -0,0 +1,79 @@
{ stdenv
, fetchFromGitHub
, pantheon
, fetchpatch
, pkgconfig
, meson
, ninja
, vala
, python3
, gtk3
, glib
, granite
, libgee
, elementary-icon-theme
, elementary-gtk-theme
, gettext
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "1.0.1";
repoName = "onboarding";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "025i9av4waqwp1gn8d6sjp8qdwg2j3jskxhmyf9qxbzwfc5msysg";
};
passthru = {
updateScript = pantheon.updateScript {
inherit repoName;
attrPath = pname;
};
};
nativeBuildInputs = [
gettext
meson
ninja
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
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";
})
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
description = "Onboarding app for new users designed for elementary OS";
homepage = https://github.com/elementary/onboarding;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}

6
pkgs/desktops/pantheon/desktop/gala/default.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "gala";
version = "unstable-2019-07-21"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
version = "unstable-2019-10-31"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "50694796d4c8f0ca92517d5a628b0efdf748279c";
sha256 = "17d0hd2145mrf8y5ws3xypdbwj72qv7hrrp6p6lm4k16xd96yznr";
rev = "0f0724c97ad49f470f41c4a25c63103f51122997";
sha256 = "09cl3k2am878iiy76bijb0ykrcafh944kz027jgi1y5yk4bwfjc4";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View file

@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.4.3";
version = "2.4.4";
repoName = "applications-menu";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
sha256 = "09ssxn264v6nzrxgk529kpdxq5j3b14z8mbwq0gni1bgjcla773d";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
View file

@ -12,8 +12,6 @@
, wingpanel
, libgee
, libxml2
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -40,11 +38,9 @@ stdenv.mkDerivation rec {
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

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

@ -16,8 +16,6 @@
, libxml2
, libsoup
, elementary-calendar
, elementary-icon-theme
, wrapGAppsHook
, fetchurl
}:
@ -37,13 +35,13 @@ in
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.1.3";
version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1y7a4xjwl3bpls56ys6g3s6mh5b3qbjm2vw7b6n2i4x7a63c4cbh";
sha256 = "1whdx0vgm0qbbzsw8dg2liz3cbh3ad5ybkriy4lmx5ynyhpbz0sx";
};
passthru = {
@ -59,11 +57,9 @@ stdenv.mkDerivation rec {
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
old-evolution-data-server
granite
gtk3
@ -73,31 +69,11 @@ stdenv.mkDerivation rec {
wingpanel
];
patches = [
# Use "clock-format" GSettings key that's been moved to granite
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch";
sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880";
})
# See: https://github.com/elementary/wingpanel-indicator-datetime/pull/117
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/4859e72a52d8dac5cad87b192fc912fb013b0ecd.patch";
sha256 = "0jfhb5sax4sivdfx7il1rc1dvhy0yfv27qhvwbdy0hza9wf8q9k0";
})
];
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
# launches elementary-calendar on selection
preFixup = ''
gappsWrapperArgs+=( --prefix PATH : "${elementary-calendar}/bin" )
'';
meta = with stdenv.lib; {
description = "Date & Time Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-datetime;

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
View file

@ -13,8 +13,6 @@
, libgee
, xorg
, libgnomekbd
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -40,11 +38,9 @@ stdenv.mkDerivation rec {
libxml2
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
View file

@ -11,8 +11,6 @@
, networkmanagerapplet
, wingpanel
, libgee
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -37,11 +35,9 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
View file

@ -10,8 +10,6 @@
, wingpanel
, libgee
, libxml2
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -37,11 +35,9 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

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

@ -10,8 +10,6 @@
, wingpanel
, libgee
, libwnck3
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -36,11 +34,9 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libgee

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
View file

@ -13,8 +13,6 @@
, udev
, wingpanel
, libgee
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -40,12 +38,10 @@ stdenv.mkDerivation rec {
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
bamf
elementary-icon-theme
granite
gtk3
libgee

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

@ -10,8 +10,6 @@
, wingpanel
, accountsservice
, libgee
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -36,12 +34,10 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
accountsservice
elementary-icon-theme
granite
gtk3
libgee

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

@ -14,8 +14,6 @@
, libcanberra-gtk3
, libgee
, libxml2
, wrapGAppsHook
, elementary-icon-theme
}:
stdenv.mkDerivation rec {
@ -42,11 +40,9 @@ stdenv.mkDerivation rec {
pkgconfig
python3
vala
wrapGAppsHook
];
buildInputs = [
elementary-icon-theme
granite
gtk3
libcanberra-gtk3

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

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

20
pkgs/desktops/pantheon/granite/default.nix
View file

@ -1,6 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, python3
, meson
, ninja
@ -17,30 +16,15 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "5.2.3";
version = "5.2.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "10ddq1s2w4jvpzq813cylmqhh8pggzaz890fy3kzg07275i98gah";
sha256 = "0z40vhcp2w8s8rnc56pzvjc4s77bln8k84rwwypivjmk3lhpw1vi";
};
patches = [
# Resolve the circular dependency between granite and the datetime wingpanel indicator
# See: https://github.com/elementary/granite/pull/242
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch";
sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq";
})
# Fix build latest vala.
(fetchpatch {
url = "https://github.com/elementary/granite/commit/fd26013c84afdeb6300ae2f4a574856753fc2b58.patch";
sha256 = "01nxqhj8gr61n6wx6ccrqdn25nmbrhhk437k21g4mxqx0gnih265";
})
];
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;

8
pkgs/desktops/pantheon/update.sh
View file

@ -114,13 +114,7 @@ EOF
function get_latest_tag ( ) {
repo_name="$1"
# Using github release api because sorting this repo just doesn't work because of old git sillyness
# Also too lazy to care to adapt `git ls-remote` command to work with it
if [ $repo_name == "switchboard-plug-pantheon-shell" ]; then
curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name'
else
git ls-remote --tags --sort="v:refname" "https://github.com/elementary/$repo_name" | tail -n1 | sed 's/.*\///; s/\^{}//'
fi
curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name'
}
#

51
pkgs/development/tools/vala-lint/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ stdenv
, fetchFromGitHub
, glib
, meson
, ninja
, pantheon
, pkgconfig
, vala
, gettext
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "vala-lint-unstable";
version = "2019-10-11";
src = fetchFromGitHub {
owner = "vala-lang";
repo = "vala-lint";
rev = "a077bbec30dea128616a23583ce3f8364ff2ef11";
sha256 = "0w0rmaj4v42wc4vq2lfjnj6airag5ahv6522xkw3j1nmccxq3s72";
};
nativeBuildInputs = [
gettext
meson
ninja
pkgconfig
vala
wrapGAppsHook
];
buildInputs = [
glib
];
# See https://github.com/vala-lang/vala-lint/issues/133
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/vala-lang/vala-lint;
description = "Check Vala code files for code-style errors";
longDescription = ''
Small command line tool and library for checking Vala code files for code-style errors.
Based on the elementary Code-Style guidelines.
'';
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -8655,6 +8655,8 @@ in
vlang = callPackage ../development/compilers/vlang { };
vala-lint = callPackage ../development/tools/vala-lint { };
inherit (callPackage ../development/compilers/vala { })
vala_0_36
vala_0_40