cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #92587 from worldofpeace/session-settings-update

Browse source 
Pantheon updates 2020-07-07
This commit is contained in:
worldofpeace 2020-07-08 01:01:05 -04:00 committed by GitHub
commit aba048f0bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 38 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
View file

@ -43,7 +43,7 @@ in
services.xserver.displayManager.lightdm.extraSeatDefaults = "greeter-show-manual-login=true";
environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf";
environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist";
environment.etc."wingpanel.d/io.elementary.greeter.allowed".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.allowed";
};
}

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

@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "5.0.5";
version = "5.0.6";
repoName = "calendar";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1dn2h7riajrn619z69626qnr8w6lp62dnm3d4pjkr0g5l4dp1cdb";
sha256 = "0lmadk4yzf1kiiqshwqcxzcyia1haq1avv6pyzvsaywxhqwdsini";
};
passthru = {

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

@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "elementary-dock";
version = "unstable-2020-02-28";
version = "unstable-2020-06-11";
outputs = [ "out" "dev" ];
@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "ac87d9063dc9c81d90f42f3002ad9c5b49460a82";
sha256 = "0lhjzd370fza488dav8n155ss486wqv6y7ldkahwg0c3zvlsvha7";
rev = "0a389ee58939d8c91c340df4e5340fc4b23d0b80";
sha256 = "01vinik73s0vmk56samgf49zr2bl4wjv44x15sz2cmh744llckja";
};
nativeBuildInputs = [

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

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.7.1";
version = "2.7.2";
repoName = "videos";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "00arim4i9bv9mbms1irkp44grkgrfnmqzraswyn1xiz9nvl1bsb9";
sha256 = "07dwhshdc78wia0fsbzz6iv651znzzasfil91w60v29kgc4s2b1i";
};
passthru = {

6
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
View file

@ -83,8 +83,10 @@ stdenv.mkDerivation rec {
cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers
# Whitelist wingpanel indicators to be used in the greeter
# TODO: is this needed or installed upstream?
install -D ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist
# hhttps://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist
# wingpanel 2.3.2 renamed this to .allowed to .forbidden
# https://github.com/elementary/wingpanel/pull/326
install -D ${./io.elementary.greeter.allowed} $out/etc/wingpanel.d/io.elementary.greeter.allowed
'';
postFixup = ''

0
pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist → pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed
View file

51
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View file

@ -1,7 +1,8 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, substituteAll
, desktop-file-utils
, pkg-config
, writeScript
, pantheon
, gnome-keyring
@ -16,7 +17,6 @@
, writeText
, meson
, ninja
, pkg-config
}:
let
@ -69,53 +69,43 @@ let
in
stdenv.mkDerivation rec {
pname = "elementary-session-settings";
version = "unstable-2019-11-12";
pname = "elementary-session-settings-unstable";
version = "2020-06-11";
repoName = "session-settings";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "f9d5afed16ce447cf6ae3c2d1c1db5eece84daca";
sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q";
rev = "130c9ae221913032ed18bcf6d21e3dcdba3c4209";
sha256 = "0bzg9vbq0ssnxgcb2vxpx6x9zv8ngkm9r3ki5q83m9al9919n0pr";
};
patches = [
# Map Pantheon required components by g-s-d versions
# https://github.com/elementary/session-settings/pull/23
(fetchpatch {
url = "https://github.com/elementary/session-settings/commit/39918f4ec64fa9ed5affa109d6a692b97ae4ff01.patch";
sha256 = "0v2kqcsibymnslnnw4v67yh098znsrhrcycgxkw8vymvwlinc502";
})
];
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
];
buildInputs = [
elementary-settings-daemon
pantheon.elementary-settings-daemon
gnome-keyring
onboard
orca
];
mesonFlags = [
"-Ddefaults-list=false"
"-Dpatched-gsd-autostarts=false"
"-Dpatched-ubuntu-autostarts=false"
"-Dmimeapps-list=false"
"-Dfallback-session=GNOME"
"-Ddetect-program-prefixes=true"
"--sysconfdir=${placeholder "out"}/etc"
];
postInstall = ''
mkdir -p $out/share/applications
cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
mkdir -p $out/etc/xdg/autostart
for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do
cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart
done
cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
mkdir -p $out/libexec
@ -127,21 +117,16 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/xsessions/pantheon.desktop \
--replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \
--replace "wingpanel" "${wingpanel}/bin/wingpanel"
for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart)
do
echo "Patching OnlyShowIn to Pantheon in: $autostart"
sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart
done
'';
passthru = {
updateScript = pantheon.updateScript {
attrPath = "pantheon.${pname}";
};
providedSessions = [ "pantheon" ];
providedSessions = [
"pantheon"
];
};
meta = with stdenv.lib; {

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

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.2.4";
version = "2.2.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0wrvya9438ncb2rvcz99aa497v95b4yhdw1479iacnb9f94jacns";
sha256 = "0z5a4jkmg8jw3yjdq89njhqcpms2rbq7rnsh83q9gh8v3qidk75d";
};
passthru = {

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

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0yvn1crylrdc9gq6gc7v4ynb5ii4n0c3bnswfq72p8cs3vvvvv24";
sha256 = "0sz3m64s5clirmiamx67iq42spba7sggcb29sny44z9f939vly4r";
};
passthru = {

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

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "granite";
version = "5.4.0";
version = "5.5.0";
outputs = [ "out" "dev" ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0";
sha256 = "13qfhq8xndikk6kmybibs6a4ddyp6mhvbsp2yy4qr7aiiyxf7mna";
};
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.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1gkispg1wr3fmwhbaaw722hc7cfqvj18gwb1nvv7rz3ghk9ih4jy";
sha256 = "1kd6spwfwy5r2mrf7xh5l2wrazqia8vr4j3g27s97vn7fcg4pgb0";
};
passthru = {