public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-15 18:30:28 +00:00
committed by GitHub
parent 665732d877 059c4b584e
commit f1b78f8618
43 changed files with 928 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome/apps/gnome-calendar/default.nix
+2 -2
View File
@@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "gnome-calendar";
version = "40.0";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38";
sha256 = "2M30n57uHDo8aZHDL4VjxKfE2w23ymPOUcyRjkM7M6U=";
};
patches = [
pkgs/desktops/gnome/apps/gnome-connections/default.nix
+22 -26
View File
@@ -1,46 +1,45 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, gnome
, meson
, ninja
, vala
, pkg-config
, vala
, gettext
, itstool
, python3
, appstream-glib
, desktop-file-utils
, wrapGAppsHook
, glib
, gtk3
, python3
, libxml2
, gtk-vnc
, gettext
, desktop-file-utils
, appstream-glib
, gobject-introspection
, freerdp
, wrapGAppsHook
, gtk-frdp
, gnome
}:
stdenv.mkDerivation rec {
pname = "gnome-connections";
version = "3.38.1";
version = "40.0.1";
src = fetchurl {
url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz";
hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA=";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE=";
};
nativeBuildInputs = [
desktop-file-utils
gettext
glib # glib-compile-resources
meson
appstream-glib
ninja
pkg-config
python3
vala
gettext
itstool
python3
appstream-glib
desktop-file-utils
glib # glib-compile-resources
wrapGAppsHook
# for gtk-frdp subproject
gobject-introspection
];
buildInputs = [
@@ -48,9 +47,7 @@ stdenv.mkDerivation rec {
gtk-vnc
gtk3
libxml2
# for gtk-frdp subproject
freerdp
gtk-frdp
];
postPatch = ''
@@ -60,8 +57,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = "connections";
attrPath = "gnome-connections";
packageName = pname;
};
};
pkgs/desktops/gnome/apps/gnome-todo/default.nix
+25 -29
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
@@ -9,13 +10,14 @@
, gettext
, gnome
, glib
, gtk3
, gtk4
, wayland
, libadwaita
, libpeas
, gnome-online-accounts
, gsettings-desktop-schemas
, libportal
, evolution-data-server
, libxml2
, libsoup
, libical
, librest
, json-glib
@@ -23,26 +25,13 @@
stdenv.mkDerivation rec {
pname = "gnome-todo";
version = "3.28.1";
version = "40.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE=";
};
patches = [
# fix build with libecal 2.0
(fetchpatch {
name = "gnome-todo-eds-libecal-2.0.patch";
url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch";
sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq";
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
nativeBuildInputs = [
meson
ninja
@@ -54,23 +43,30 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gtk3
gtk4
wayland # required by gtk header
libadwaita
libpeas
gnome-online-accounts
gsettings-desktop-schemas
gnome.adwaita-icon-theme
# Plug-ins
evolution-data-server
libxml2
libsoup
libportal # background
evolution-data-server # eds
libical
librest
json-glib
librest # todoist
json-glib # todoist
];
# Fix parallel building: missing dependency from src/gtd-application.c
# Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170
preBuild = "ninja src/gtd-vcs-identifier.h";
postPatch = ''
chmod +x build-aux/meson/meson_post_install.py
patchShebangs build-aux/meson/meson_post_install.py
# https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103
substituteInPlace src/meson.build \
--replace 'Gtk-3.0' 'Gtk-4.0'
'';
passthru = {
updateScript = gnome.updateScript {
pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
+15 -3
View File
@@ -12,17 +12,20 @@
, libvncserver
, libsecret
, libnotify
, libxkbcommon
, gdk-pixbuf
, freerdp
, fuse3
, gnome
}:
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
version = "0.1.9";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8=";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek=";
};
nativeBuildInputs = [
@@ -36,11 +39,13 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo
freerdp
fuse3
gdk-pixbuf # For libnotify
glib
libnotify
libsecret
libvncserver
libxkbcommon
pipewire
systemd
];
@@ -54,6 +59,13 @@ stdenv.mkDerivation rec {
"-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user"
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop";
description = "GNOME Remote Desktop server";
pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
+32 -27
View File
@@ -1,20 +1,23 @@
{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib
, gnome, gnome-menus, substituteAll }:
{ lib
, stdenv
, fetchurl
, meson
, ninja
, gettext
, pkg-config
, glib
, gnome
, gnome-menus
, substituteAll
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
version = "40.0";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p";
};
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8=";
};
patches = [
@@ -22,24 +25,19 @@ stdenv.mkDerivation rec {
src = ./fix_gmenu.patch;
gmenu_path = "${gnome-menus}/lib/girepository-1.0";
})
# Do not show welcome dialog in gnome-classic.
# Needed for gnome-shell 40.1.
# https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch";
sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w=";
})
];
doCheck = true;
# 60 is required for tests
# https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23
checkInputs = [ spidermonkey_68 ];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
glib
];
nativeBuildInputs = [ meson ninja pkg-config gettext glib ];
mesonFlags = [ "-Dextension_set=all" ];
mesonFlags = [
"-Dextension_set=all"
];
preFixup = ''
# The meson build doesn't compile the schemas.
@@ -63,11 +61,18 @@ stdenv.mkDerivation rec {
done
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions";
description = "Modify and extend GNOME Shell functionality and behavior";
maintainers = teams.gnome.members;
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
pkgs/desktops/gnome/core/gnome-shell/default.nix
+4 -11
View File
@@ -1,6 +1,5 @@
{ fetchurl
, fetchpatch
, fetchgit
, substituteAll
, lib, stdenv
, meson
@@ -67,20 +66,14 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "40.0-unstable-2021-05-01";
version = "40.1";
outputs = [ "out" "devdoc" ];
src = fetchgit {
url = "https://gitlab.gnome.org/GNOME/gnome-shell.git";
rev = "a8a79c03330427808e776c344f7ebc42782a1b5a";
sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs=";
fetchSubmodules = true;
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-9j4r7Zm9iVjPMT2F9EoBjVn4UqBbqfKap8t0S+xvprc=";
};
# src = fetchurl {
# url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
# sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg=";
# };
patches = [
# Hardcode paths to various dependencies so that they can be found at runtime.
pkgs/desktops/gnome/core/mutter/default.nix
+4 -11
View File
@@ -1,8 +1,8 @@
{ fetchurl
, fetchpatch
, substituteAll
, runCommand
, lib, stdenv
, lib
, stdenv
, pkg-config
, gnome
, gettext
@@ -45,13 +45,13 @@
let self = stdenv.mkDerivation rec {
pname = "mutter";
version = "40.0";
version = "40.1";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4=";
sha256 = "sha256-pl8ycpYRM4KWh9QQcmfk4ZKQ5thueAf62H6rCDHB4MA=";
};
patches = [
@@ -63,13 +63,6 @@ let self = stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit zenity;
})
# Fix non-deterministic build failure:
# https://gitlab.gnome.org/GNOME/mutter/-/issues/1682
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch";
sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU=";
})
];
mesonFlags = [
pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
+9 -7
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
version = "35";
version = "38";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs=";
sha256 = "sha256-LZ+C9iK+j7+DEscYCIObxXc0Bn0Z0xSsEFMZxc8REWA=";
};
patches = [
@@ -28,11 +28,13 @@ stdenv.mkDerivation rec {
dontBuild = true;
uuid = "sound-output-device-chooser@kgshank.net";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r ${uuid} $out/share/gnome-shell/extensions
runHook postInstall
makeFlags = [
"INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions"
];
preInstall = ''
mkdir -p ${placeholder "out"}/share/gnome-shell/extensions
'';
meta = with lib; {
pkgs/desktops/gnome/extensions/system-monitor/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
version = "unstable-2021-04-08";
version = "unstable-2021-05-04";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "942603da39de12f50b1f86efbde92d7526d1290e";
sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw";
rev = "bc38ccf49ac0ffae0fc0436f3c2579fc86949f10";
sha256 = "0yb5sb2xv4m18a24h4daahnxgnlmbfa0rfzic0zs082qv1kfi5h8";
};
buildInputs = [