mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Merge pull request #84916 from worldofpeace/pantheon-update-04-10

Browse source 
Pantheon update 2020-04-10
This commit is contained in:
worldofpeace 2020-04-10 14:17:48 -04:00 committed by GitHub
parent 168a045e25 dd805599a9
commit 0e27a1f2b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 30 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "3.2.3";
version = "3.2.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12gql86vn12zbkw368blxk0cl9fgs22dyj02xnimjc8b6s80yib4";
sha256 = "0nhgf5lgy74liml3kzijldan3qgrxh2721yvjdk4jf83b0g1b7yb";
};
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.5";
version = "2.7.0";
repoName = "photos";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0r6d9y936nw4bn0jvixi1p62dy8qsgl2bx8g3889fndnhfnhbjv0";
sha256 = "09jjic165rmprc2cszsgj2m3j3f5p8v9pxx5mj66a0gj3ar3hfbd";
};
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.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71";
sha256 = "1cjhip0abc0y5w6cqnjcgi48bfrackp45gz7955l66hxhnm5wyw6";
};
passthru = {

4
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.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg";
sha256 = "0wzm390g8di4ks3w637a0wl4j7g89j321xkz5msd9058gksvaaxs";
};
passthru = {

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.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh";
sha256 = "1racp0mxiaix9afx25ryskdcyi335fz8yh8nwgdxbqbm6jpyq4zs";
};
passthru = {

4
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.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7";
sha256 = "19y1n05pc3j0px5pql5338vzrq6hjw209s8l2l70ha4i4r978qir";
};
passthru = {

26
pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch
View file

@ -1,26 +0,0 @@
diff --git a/set-wallpaper-contract/set-wallpaper.vala b/set-wallpaper-contract/set-wallpaper.vala
index 3e02089..7ce7041 100644
--- a/set-wallpaper-contract/set-wallpaper.vala
+++ b/set-wallpaper-contract/set-wallpaper.vala
@@ -38,7 +38,7 @@ namespace SetWallpaperContractor {
</transition>
""";
- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds";
+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds";
private int delay_value = 60;
diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
index 4be14fa..aa8832f 100644
--- a/src/Views/Wallpaper.vala
+++ b/src/Views/Wallpaper.vala
@@ -38,7 +38,7 @@ public class Wallpaper : Gtk.Grid {
FileAttribute.THUMBNAIL_IS_VALID
};
- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds";
+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds";
public Switchboard.Plug plug { get; construct set; }
private GLib.Settings settings;

8
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.2";
version = "2.8.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z";
sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8";
};
passthru = {
@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
];
meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell";

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

24
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch
View file

@ -1,24 +0,0 @@
diff --git a/lib/synapse-plugins/calculator-plugin.vala b/lib/synapse-plugins/calculator-plugin.vala
index 1b5fa06..076c0c7 100644
--- a/lib/synapse-plugins/calculator-plugin.vala
+++ b/lib/synapse-plugins/calculator-plugin.vala
@@ -51,9 +51,7 @@ namespace Synapse {
_("Calculator"),
_("Calculate basic expressions."),
"accessories-calculator",
- register_plugin,
- Environment.find_program_in_path ("bc") != null,
- _("bc is not installed"));
+ register_plugin);
}
static construct {
@@ -90,7 +88,7 @@ namespace Synapse {
if (matched) {
Pid pid;
int read_fd, write_fd;
- string[] argv = {"bc", "-l"};
+ string[] argv = {"@exec@", "-l"};
string? solution = null;
try {

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.5.0";
version = "2.6.0";
repoName = "applications-menu";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d";
sha256 = "16ki1x6697jmfqajynx2zvwqrpjpshnd08y7vf6g7xc7zwwh38c5";
};
passthru = {

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

@ -7,6 +7,7 @@
, ninja
, vala
, gtk3
, glib
, granite
, libnotify
, wingpanel
@ -16,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1";
sha256 = "0ylbpai05b300h07b94xcmw9xi7qx13l1q38zlg2n95d3c5264dp";
};
passthru = {
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2
meson
ninja
@ -41,6 +43,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
glib
granite
gtk3
libgee

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

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "unstable-2020-04-04";
version = "2.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "366f0f6ffa59f7ee2583d000dd334cb764f9a2b8";
sha256 = "172r1k8m1saq80q6g2hxy4ajks8liaw9pl6lixasrzi2hsnrx53h";
rev = version;
sha256 = "0yvn1crylrdc9gq6gc7v4ynb5ii4n0c3bnswfq72p8cs3vvvvv24";
};
passthru = {

4
pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
View file

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.2.4";
version = "2.2.5";
repoName = "capnet-assist";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1";
sha256 = "09pl1ynrmqjj844np4ww2i18z7kgx5kmj5ggfp8lqmxgsny7g8m3";
};
passthru = {

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

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "pantheon-agent-polkit";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1yybblprcn0cgcf9j76yckqcimm4h8l41cczxjvgp789p1pki3bn";
sha256 = "137809mplrsff1isxwbwa2v2y9ixhwzm4khiijm4mmjchi75wpvx";
};
passthru = {