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

gnome-online-accounts: move from gnome3

Browse Source
This commit is contained in:
Jan Tojnar 2019-08-23 02:45:09 +02:00
parent 4a558194cb
commit fac090c8dd
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
10 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
View File

@ -30,9 +30,9 @@ with lib;
config = mkIf config.services.gnome3.gnome-online-accounts.enable { config = mkIf config.services.gnome3.gnome-online-accounts.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ]; environment.systemPackages = [ pkgs.gnome-online-accounts ];
services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ]; services.dbus.packages = [ pkgs.gnome-online-accounts ];
}; };

4
pkgs/applications/backup/deja-dup/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext { stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
, gnome3, libnotify, itstool, glib, gtk3, libxml2 , gnome3, libnotify, itstool, glib, gtk3, libxml2, gnome-online-accounts
, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook , coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook
, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
, appstream-glib, desktop-file-utils, duplicity , appstream-glib, desktop-file-utils, duplicity
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libnotify libpeas glib gtk3 libsecret libnotify libpeas glib gtk3 libsecret
pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror at-spi2-core dbus gnome-online-accounts libgpgerror
]; ];
propagatedUserEnvPkgs = [ duplicity ]; propagatedUserEnvPkgs = [ duplicity ];

4
pkgs/applications/networking/feedreaders/feedreader/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl glib json-glib libnotify libsecret sqlite gumbo gtk3 curl glib json-glib libnotify libsecret sqlite gumbo gtk3
libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
gnome3.gnome-online-accounts gnome-online-accounts
hicolor-icon-theme # for setup hook hicolor-icon-theme # for setup hook
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gstreamer gst-plugins-base gst-plugins-good

4
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig { stdenv, meson, ninja, gettext, fetchurl, pkgconfig
, wrapGAppsHook, itstool, desktop-file-utils, python3 , wrapGAppsHook, itstool, desktop-file-utils, python3
, glib, gtk3, evolution-data-server , glib, gtk3, evolution-data-server, gnome-online-accounts
, libuuid, webkitgtk, zeitgeist , libuuid, webkitgtk, zeitgeist
, gnome3, libxml2, gsettings-desktop-schemas }: , gnome3, libxml2, gsettings-desktop-schemas }:
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 libuuid webkitgtk gnome3.tracker glib gtk3 libuuid webkitgtk gnome3.tracker
gnome3.gnome-online-accounts zeitgeist gnome-online-accounts zeitgeist
gsettings-desktop-schemas gsettings-desktop-schemas
evolution-data-server evolution-data-server
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme

3
pkgs/desktops/gnome-3/default.nix
View File

@ -113,8 +113,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnome-keyring = callPackage ./core/libgnome-keyring { };
gnome-online-accounts = callPackage ./core/gnome-online-accounts { };
gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-online-miners = callPackage ./core/gnome-online-miners { };
gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
@ -391,6 +389,7 @@ lib.makeScope pkgs.newScope (self: with self; {
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19 inherit (pkgs) gnome-video-effects; # added 2019-08-19
inherit (pkgs) gnome-online-accounts; # added 2019-08-23
defaultIconTheme = adwaita-icon-theme; defaultIconTheme = adwaita-icon-theme;
gtk = gtk3; gtk = gtk3;

4
pkgs/development/libraries/gfbgraph/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, librest { stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts
, gnome3, libsoup, json-glib, gobject-introspection }: , gnome3, libsoup, json-glib, gobject-introspection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig gobject-introspection ]; nativeBuildInputs = [ pkgconfig gobject-introspection ];
buildInputs = [ glib gnome3.gnome-online-accounts ]; buildInputs = [ glib gnome-online-accounts ];
propagatedBuildInputs = [ libsoup json-glib librest ]; propagatedBuildInputs = [ libsoup json-glib librest ];
configureFlags = [ "--enable-introspection" ]; configureFlags = [ "--enable-introspection" ];

0
pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix → pkgs/development/libraries/gnome-online-accounts/default.nix
View File

3
pkgs/development/libraries/libgdata/default.nix
View File

@ -10,6 +10,7 @@
, glib , glib
, json-glib , json-glib
, gcr , gcr
, gnome-online-accounts
, gobject-introspection , gobject-introspection
, liboauth , liboauth
, gnome3 , gnome3
@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gnome3.gnome-online-accounts gnome-online-accounts
json-glib json-glib
]; ];

4
pkgs/development/libraries/libzapojit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gobject-introspection }: { stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libzapojit"; pname = "libzapojit";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
propagatedBuildInputs = [ glib json-glib librest libsoup gnome3.gnome-online-accounts ]; # zapojit-0.0.pc propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

4
pkgs/top-level/all-packages.nix
View File

@ -9501,6 +9501,8 @@ in
gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { };
gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { };
gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { }; gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { };
gnum4 = callPackage ../development/tools/misc/gnum4 { }; gnum4 = callPackage ../development/tools/misc/gnum4 { };
@ -18630,7 +18632,7 @@ in
gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gnome-mpv = callPackage ../applications/video/gnome-mpv { };
gnome-recipes = callPackage ../applications/misc/gnome-recipes { gnome-recipes = callPackage ../applications/misc/gnome-recipes {
inherit (gnome3) gnome-online-accounts gnome-autoar; inherit (gnome3) gnome-autoar;
}; };
gollum = callPackage ../applications/misc/gollum { }; gollum = callPackage ../applications/misc/gollum { };